Integrates esp32-camera as submodule and build option

Adds esp32-camera as a git submodule and build dependency,
streamlines include path usage, and introduces camera model
as a configurable build argument. Simplifies CMake logic for
esp32-camera detection and improves build.sh usability.

Author: cnadler86

.gitignore

@@ -6,6 +6,9 @@
 #.vscode folder
 .vscode/
 
+# Build
+/build/
+
 # User-specific files
 *.rsuser
 *.suo

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "esp32-camera"]
+	path = esp32-camera
+	url = https://github.com/cnadler86/esp32-camera.git

CMakeLists.txt

@@ -2,4 +2,6 @@
 # This allows the IDF component manager to process idf_component.yml
 # The actual MicroPython module is built via micropython.cmake
 
-idf_component_register()
+idf_component_register(
+    REQUIRES esp32-camera
+)

build.sh

@@ -5,36 +5,40 @@ set -e
 IDF_PATH_DEFAULT="$HOME/esp/esp-idf"
 MICROPYTHON_PATH=""
 IDF_PATH="$IDF_PATH_DEFAULT"
-BOARD=""
+BOARD="ESP32_GENERIC_S3"
 BOARD_VARIANT=""
+CAMERA_MODEL=""
 BUILD_DIR="build-mp_camera"
 
 # Parse arguments
 usage() {
-    echo "Usage: $0 -m <micropython_path> [-i <idf_path>] [-b <board>] [-v <board_variant>]"
+    echo "Usage: $0 -m <micropython_path> [-i <idf_path>] [-b <board>] [-v <board_variant>] [-c <camera_model>]"
     echo ""
     echo "Options:"
     echo "  -m <path>    Path to MicroPython directory (required)"
     echo "  -i <path>    Path to ESP-IDF directory (optional, default: $IDF_PATH_DEFAULT)"
-    echo "  -b <board>   Board name (optional, e.g. ESP32_GENERIC_S3)"
+    echo "  -b <board>   Board name (optional, e.g. ESP32_GENERIC_S3, default: $BOARD)"
     echo "  -v <variant> Board variant (optional, e.g. SPIRAM_OCT)"
+    echo "  -c <model>   Camera model (optional, e.g. FREENOVE_ESP32S3_CAM)"
     echo "  -h           Show this help message"
     echo ""
     echo "Examples:"
     echo "  $0 -m ~/privat/micropython"
     echo "  $0 -m ~/privat/micropython -i ~/esp/esp-idf"
     echo "  $0 -m ~/privat/micropython -b ESP32_GENERIC_S3"
     echo "  $0 -m ~/privat/micropython -b ESP32_GENERIC_S3 -v SPIRAM_OCT"
+    echo "  $0 -m ~/privat/micropython -b ESP32_GENERIC_S3 -c FREENOVE_ESP32S3_CAM"
     exit 1
 }
 
 # Parse command line options
-while getopts "m:i:b:v:h" opt; do
+while getopts "m:i:b:v:c:h" opt; do
     case $opt in
         m) MICROPYTHON_PATH="$OPTARG" ;;
         i) IDF_PATH="$OPTARG" ;;
         b) BOARD="$OPTARG" ;;
         v) BOARD_VARIANT="$OPTARG" ;;
+        c) CAMERA_MODEL="$OPTARG" ;;
         h) usage ;;
         *) usage ;;
     esac
@@ -69,18 +73,22 @@ IDF_PATH=$(realpath "$IDF_PATH")
 MODULE_PATH=$(dirname "$(realpath "$0")")
 
 echo "=========================================="
-echo "Building MicroPython with IR Learn Module"
+echo "Building MicroPython with Camera Module"
 echo "=========================================="
 echo "MicroPython path: $MICROPYTHON_PATH"
 echo "ESP-IDF path:     $IDF_PATH"
 echo "Module path:      $MODULE_PATH"
 if [ -n "$BOARD" ]; then
     echo "Board:            $BOARD"
+    BUILD_DIR="${BUILD_DIR}-${BOARD}"
     if [ -n "$BOARD_VARIANT" ]; then
         echo "Board variant:    $BOARD_VARIANT"
-        BUILD_DIR="build-${BOARD_VARIANT}"
+        BUILD_DIR="${BUILD_DIR}_${BOARD_VARIANT}"
     fi
 fi
+if [ -n "$CAMERA_MODEL" ]; then
+    echo "Camera model:     $CAMERA_MODEL"
+fi
 echo "Build directory:  $BUILD_DIR"
 echo "=========================================="
 echo ""
@@ -103,6 +111,10 @@ if [ -n "$BOARD_VARIANT" ]; then
     IDF_CMD="$IDF_CMD -D MICROPY_BOARD_VARIANT=$BOARD_VARIANT"
 fi
 
+if [ -n "$CAMERA_MODEL" ]; then
+    IDF_CMD="$IDF_CMD -D MICROPY_CAMERA_MODEL=$CAMERA_MODEL"
+fi
+
 IDF_CMD="$IDF_CMD -D USER_C_MODULES=$MODULE_PATH/micropython.cmake"
 IDF_CMD="$IDF_CMD -D EXTRA_COMPONENT_DIRS=$MODULE_PATH"
 IDF_CMD="$IDF_CMD build"
@@ -129,4 +141,8 @@ python "$MICROPYTHON_PATH/ports/esp32/makeimg.py" \
 echo ""
 echo "Build completed successfully!"
 echo "Firmware files in: $MICROPYTHON_PATH/ports/esp32/$BUILD_DIR"
-echo "=========================================="
+echo "=========================================="
+
+# Clean up build directory
+cd "$MODULE_PATH"
+rm -rf build

esp32-camera

@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/esp32-camera:
-    git: https://github.com/cnadler86/esp32-camera.git
+    override_path: esp32-camera
   espressif/esp_new_jpeg: "^1.0.0"
   idf:
     version: ">=5.2.0"

idf_component.yml

@@ -9,48 +9,22 @@ target_sources(usermod_mp_camera INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}/src/modcamera_api.c
 )
 
-# Register dependency on esp32-camera component
-# The component is managed by IDF component manager via idf_component.yml
-# Add include directories directly from managed_components (they exist after Component Manager ran)
-# Allow manual override via ESP32_CAMERA_DIR
-if(DEFINED ESP32_CAMERA_DIR AND EXISTS "${ESP32_CAMERA_DIR}")
-    message(STATUS "Using user-defined ESP32_CAMERA_DIR: ${ESP32_CAMERA_DIR}")
-    set(ESP32_CAMERA_MANAGED_DIR "${ESP32_CAMERA_DIR}")
-else()
-    set(ESP32_CAMERA_MANAGED_DIR "${MICROPY_PORT_DIR}/managed_components/espressif__esp32-camera")
-endif()
+idf_component_get_property(camera_dir esp32-camera COMPONENT_DIR)
+target_include_directories(usermod_mp_camera INTERFACE
+    ${camera_dir}/driver/include
+    ${camera_dir}/driver/private_include
+    ${camera_dir}/sensors/private_include
+)
 
-if(EXISTS "${ESP32_CAMERA_MANAGED_DIR}")
-    # Add standard include directories for esp32-camera
-    list(APPEND MICROPY_INC_USERMOD
-        ${ESP32_CAMERA_MANAGED_DIR}/driver/include
-        ${ESP32_CAMERA_MANAGED_DIR}/driver/private_include
-        ${ESP32_CAMERA_MANAGED_DIR}/conversions/include
-        ${ESP32_CAMERA_MANAGED_DIR}/conversions/private_include
-        ${ESP32_CAMERA_MANAGED_DIR}/sensors/private_include
-    )
-    
-    message(STATUS "Found esp32-camera at: ${ESP32_CAMERA_MANAGED_DIR}")
-    
-    # Link against the component library when target exists (during actual build)
-    # The target doesn't exist yet during include(), but will exist during build
-    if(TARGET espressif__esp32-camera)
-        idf_component_get_property(esp32_camera_lib espressif__esp32-camera COMPONENT_LIB)
-        target_link_libraries(usermod_mp_camera INTERFACE ${esp32_camera_lib})
-    endif()
-    
-    # Set MP_CAMERA_DRIVER_VERSION if available
-    if(EXISTS "${ESP32_CAMERA_MANAGED_DIR}/idf_component.yml")
-        file(READ "${ESP32_CAMERA_MANAGED_DIR}/idf_component.yml" _camera_component_yml)
-        string(REGEX MATCH "version: ([0-9]+\\.[0-9]+(\\.[0-9]+)?)" _ ${_camera_component_yml})
-        if(CMAKE_MATCH_1)
-            set(MP_CAMERA_DRIVER_VERSION "${CMAKE_MATCH_1}")
-            message(STATUS "Found esp32-camera version: ${MP_CAMERA_DRIVER_VERSION}")
-        endif()
-    endif()
-else()
-    message(WARNING "esp32-camera component not found - component manager should have downloaded it based on idf_component.yml")
-endif()
+#     # Set MP_CAMERA_DRIVER_VERSION if available
+#     if(EXISTS "${ESP32_CAMERA_MANAGED_DIR}/idf_component.yml")
+#         file(READ "${ESP32_CAMERA_MANAGED_DIR}/idf_component.yml" _camera_component_yml)
+#         string(REGEX MATCH "version: ([0-9]+\\.[0-9]+(\\.[0-9]+)?)" _ ${_camera_component_yml})
+#         if(CMAKE_MATCH_1)
+#             set(MP_CAMERA_DRIVER_VERSION "${CMAKE_MATCH_1}")
+#             message(STATUS "Found esp32-camera version: ${MP_CAMERA_DRIVER_VERSION}")
+#         endif()
+#     endif()
 
 # Check if MP_JPEG_DIR is set or if mp_jpeg directory exists two levels up
 if(DEFINED MP_JPEG_DIR AND EXISTS "${MP_JPEG_DIR}")

micropython.cmake

@@ -44,7 +44,7 @@
 
 // Get the I2C port from the I2C object. This will be deleted in the future
 // Structure matches machine_hw_i2c_obj_t from machine_i2c.c
-#if MICROPY_HW_ESP_NEW_I2C_DRIVER && CONFIG_SCCB_HARDWARE_I2C_DRIVER_NEW
+#if MICROPY_HW_ESP_NEW_I2C_DRIVER
     typedef struct _machine_hw_i2c_obj_t {
         mp_obj_base_t base;
         i2c_master_bus_handle_t bus_handle;
@@ -57,7 +57,7 @@
         uint32_t freq;
         uint32_t timeout_us;
     } machine_hw_i2c_obj_t;
-#elif CONFIG_SCCB_HARDWARE_I2C_DRIVER_LEGACY
+#else
     typedef struct _machine_hw_i2c_obj_t {
         mp_obj_base_t base;
         i2c_port_t port : 8;
@@ -66,8 +66,6 @@
         uint32_t freq;
         uint32_t timeout_us;
     } machine_hw_i2c_obj_t;
-#else
-    #error "Unsupported I2C driver configuration for casmera module"
 #endif
 
 typedef struct mp_camera_obj_t mp_camera_obj;