Skip to content

Commit 59d8fa0

Browse files
tannewtclaude
andcommitted
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/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cmake_minimum_required(VERSION 3.16)
55
set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
66

77
# The component list here determines what options we get in menuconfig and what the ninja file can build.
8-
set(COMPONENTS bt driver esp_driver_dac esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_i2s esp_driver_ledc esp_driver_pcnt esp_driver_rmt esp_driver_sdmmc esp_driver_spi esp_driver_tsens esp_driver_uart esp-tls esp_adc esp_event esp_netif esp_psram esp_wifi esptool_py freertos log lwip main mbedtls mdns soc ulp wpa_supplicant esp_lcd vfs esp_stdio sdmmc)
9-
set(EXTRA_COMPONENT_DIRS "esp-protocols/components/mdns")
8+
set(COMPONENTS bt driver esp_driver_dac esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_i2s esp_driver_ledc esp_driver_pcnt esp_driver_rmt esp_driver_sdmmc esp_driver_spi esp_driver_tsens esp_driver_uart esp-tls esp_adc esp_event esp_netif esp_psram esp_wifi esptool_py freertos log lwip main mbedtls mdns soc ulp wpa_supplicant esp_lcd vfs esp_stdio sdmmc esp-camera)
9+
set(EXTRA_COMPONENT_DIRS "esp-protocols/components/mdns" "esp-camera")
1010

1111
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
1212
project(circuitpython)

ports/espressif/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ do-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
728728
QSTR_GLOBAL_REQUIREMENTS += $(BUILD)/esp-idf/config/sdkconfig.h
729729
$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig boards/$(BOARD)/mpconfigboard.mk CMakeLists.txt | $(BUILD)/esp-idf
730730
$(STEPECHO) "LINK $@"
731-
$(Q)env IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja
731+
$(Q)env IDF_PATH=$(IDF_PATH) IDF_COMPONENT_MANAGER=0 cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja
732732
$(Q)$(PYTHON) tools/check-sdkconfig.py \
733733
CIRCUITPY_DUALBANK=$(CIRCUITPY_DUALBANK) \
734734
CIRCUITPY_STORAGE_EXTEND=$(CIRCUITPY_STORAGE_EXTEND) \

ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2_ros/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1313
CIRCUITPY_ESP_PSRAM_MODE = qio
1414
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1515

16-
CIRCUITPY_RCLCPY = 1
16+
CIRCUITPY_RCLCPY = 0

ports/espressif/boards/m5stack_cardputer_ros/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CIRCUITPY_ESP_FLASH_MODE = qio
99
CIRCUITPY_ESP_FLASH_FREQ = 80m
1010
CIRCUITPY_ESP_FLASH_SIZE = 8MB
1111

12-
CIRCUITPY_RCLCPY = 1
12+
CIRCUITPY_RCLCPY = 0
1313

1414
# Very few pins.
1515
CIRCUITPY_ESPCAMERA = 0

ports/espressif/common-hal/espcamera/Camera.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ void common_hal_espcamera_camera_construct(
8686
self->camera_config.pin_reset = reset_pin ? common_hal_mcu_pin_number(reset_pin) : NO_PIN;
8787
self->camera_config.pin_xclk = external_clock_pin ? common_hal_mcu_pin_number(external_clock_pin) : NO_PIN;
8888

89-
self->camera_config.sccb_i2c_master_bus_handle = self->i2c->handle;
89+
self->camera_config.pin_sccb_sda = common_hal_mcu_pin_number(i2c->sda_pin);
90+
self->camera_config.pin_sccb_scl = common_hal_mcu_pin_number(i2c->scl_pin);
9091

9192
self->camera_config.pin_d7 = data_pins[7];
9293
self->camera_config.pin_d6 = data_pins[6];

ports/espressif/esp-camera

Submodule esp-camera updated 84 files

0 commit comments

Comments
 (0)