Commit 59d8fa0
Update esp-camera submodule for IDF v6 and fix camera build
- Merge upstream espressif/esp32-camera (IDF v6 fixes) into
circuitpython branch of esp-camera submodule
- Add esp-camera to COMPONENTS list and EXTRA_COMPONENT_DIRS in
CMakeLists.txt (required for IDF v6 component discovery)
- Disable IDF component manager (IDF_COMPONENT_MANAGER=0) to prevent
unresolved esp_jpeg dependency from blocking the build
- Add Kconfig option CONFIG_CAMERA_JPEG_DECODE_ENABLED to make
esp_jpeg dependency optional
- Update Camera.c to pass SDA/SCL pins instead of removed
sccb_i2c_master_bus_handle field
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent e732d97 commit 59d8fa0
6 files changed
Lines changed: 8 additions & 7 deletions
File tree
- ports/espressif
- boards
- espressif_esp32s3_devkitc_1_n8r2_ros
- m5stack_cardputer_ros
- common-hal/espcamera
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
| 8 | + | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
728 | 728 | | |
729 | 729 | | |
730 | 730 | | |
731 | | - | |
| 731 | + | |
732 | 732 | | |
733 | 733 | | |
734 | 734 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
| 90 | + | |
90 | 91 | | |
91 | 92 | | |
92 | 93 | | |
| |||
Submodule esp-camera updated 84 files
- .codespellrc+6
- .github/workflows/build.yml+2-1
- .github/workflows/pre_commit.yml+54
- .gitignore+2-1
- .pre-commit-config.yaml+8
- CMakeLists.txt+20-19
- Kconfig+68-1
- README.md+61-18
- conversions/esp_jpg_decode.c-134
- conversions/include/esp_jpg_decode.h-43
- conversions/include/img_converters.h+44-3
- conversions/jpge.cpp+1-1
- conversions/to_bmp.c+84-152
- conversions/to_jpg.cpp+25-5
- driver/cam_hal.c+342-66
- driver/esp_camera.c+109-47
- driver/esp_camera_af.c+215
- driver/include/esp_camera.h+36-9
- driver/include/esp_camera_af.h+104
- driver/include/sensor.h+21
- driver/private_include/cam_hal.h+5-2
- driver/private_include/sccb.h+2-5
- driver/sccb-ng.c+164-94
- driver/sccb.c+9-19
- driver/sensor.c+6
- examples/camera_example/main/CMakeLists.txt+1-1
- examples/camera_example/main/camera_pinout.h+102
- examples/camera_example/main/take_picture.c+45-44
- examples/camera_example/sdkconfig.defaults+1-1
- idf_component.yml+2
- sensors/bf20a6.c+11-3
- sensors/bf3005.c+11-3
- sensors/gc0308.c+464-89
- sensors/gc032a.c+11-3
- sensors/gc2145.c+11-3
- sensors/hm0360.c+484
- sensors/hm1055.c+841
- sensors/mega_ccm.c+415
- sensors/nt99141.c+12-3
- sensors/ov2640.c+11-2
- sensors/ov3660.c+11-2
- sensors/ov5640.c+23-5
- sensors/ov5640_af.c+241
- sensors/ov7670.c+10-2
- sensors/ov7725.c+11-3
- sensors/private_include/bf20a6.h+2-2
- sensors/private_include/bf3005.h+2-2
- sensors/private_include/gc0308.h+2-2
- sensors/private_include/gc0308_regs.h+115-3
- sensors/private_include/gc0308_settings.h+6-2
- sensors/private_include/gc032a.h+2-2
- sensors/private_include/gc2145.h+2-2
- sensors/private_include/gc2145_settings.h+1-1
- sensors/private_include/hm0360.h+27
- sensors/private_include/hm0360_regs.h+150
- sensors/private_include/hm0360_settings.h+549
- sensors/private_include/hm1055.h+27
- sensors/private_include/hm1055_regs.h+120
- sensors/private_include/hm1055_settings.h+697
- sensors/private_include/mega_ccm.h+31
- sensors/private_include/mega_ccm_regs.h+43
- sensors/private_include/mega_ccm_settings.h+19
- sensors/private_include/nt99141.h+2-2
- sensors/private_include/ov2640.h+2-2
- sensors/private_include/ov3660.h+2-2
- sensors/private_include/ov5640.h+12-2
- sensors/private_include/ov5640_af_firmware.h+267
- sensors/private_include/ov7670.h+2-2
- sensors/private_include/ov7725.h+2-2
- sensors/private_include/sc030iot.h+2-2
- sensors/private_include/sc031gs.h+3-3
- sensors/private_include/sc101iot.h+2-2
- sensors/sc030iot.c+10-2
- sensors/sc031gs.c+10-2
- sensors/sc101iot.c+10-2
- target/esp32/ll_cam.c+18-6
- target/esp32s2/ll_cam.c+16-5
- target/esp32s2/private_include/tjpgd.h+3-3
- target/esp32s3/ll_cam.c+41-20
- target/jpeg_include/tjpgd.h-99
- target/tjpgd.c-970
- target/xclk.c+5-2
- test/CMakeLists.txt+2-1
- test/test_camera.c+5-3
0 commit comments