ports/espressif/common-hal/espcamera/Camera.c: check for unspecified pins

Author: dhalbert

ports/espressif/boards/adafruit_esp32s3_camera/board.c

@@ -16,7 +16,6 @@
 
 #include "esp_log.h"
 #include "esp_err.h"
-#include "driver/i2c.h"
 
 
 #define DELAY 0x80

ports/espressif/boards/seeed_xiao_esp32_s3_sense/board.c

@@ -4,10 +4,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "supervisor/board.h"
 #include "mpconfigboard.h"
-#include "esp_log.h"
-#include "esp_err.h"
-#include "driver/i2c.h"
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

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

@@ -26,7 +26,12 @@
 #ifndef CONFIG_PM_ENABLE
 #define CONFIG_PM_ENABLE 0
 #endif
-#include "esp-idf/components/driver/i2c/i2c_private.h"
+
+// i2c_private.h uses `#if` with some macros that may be undefined and taken as 0.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wundef"
+#include "esp-idf/components/esp_driver_i2c/i2c_private.h"
+#pragma GCC diagnostic pop
 
 #include "esp-camera/driver/private_include/cam_hal.h"
 
@@ -90,13 +95,12 @@ void common_hal_espcamera_camera_construct(
 
     self->i2c = i2c;
 
-    self->camera_config.pin_pwdn = common_hal_mcu_pin_number(powerdown_pin);
-    self->camera_config.pin_reset = common_hal_mcu_pin_number(reset_pin);
-    self->camera_config.pin_xclk = common_hal_mcu_pin_number(external_clock_pin);
+    // These pins might be NULL because they were not specified.
+    self->camera_config.pin_pwdn = powerdown_pin ? common_hal_mcu_pin_number(powerdown_pin) : NO_PIN;
+    self->camera_config.pin_reset = reset_pin ? common_hal_mcu_pin_number(reset_pin) : NO_PIN;
+    self->camera_config.pin_xclk = external_clock_pin ? common_hal_mcu_pin_number(external_clock_pin) : NO_PIN;
 
-    self->camera_config.pin_sccb_sda = NO_PIN;
-    self->camera_config.pin_sccb_scl = NO_PIN;
-    /* sccb i2c port set below */
+    self->camera_config.sccb_i2c_master_bus_handle = self->i2c->handle;
 
     self->camera_config.pin_d7 = data_pins[7];
     self->camera_config.pin_d6 = data_pins[6];
@@ -119,7 +123,7 @@ void common_hal_espcamera_camera_construct(
     self->camera_config.fb_count = framebuffer_count;
     self->camera_config.grab_mode = grab_mode;
 
-    self->camera_config.sccb_i2c_port = self->i2c->handle->base->port_num;
+
 
     i2c_lock(self);
     esp_err_t result = esp_camera_init(&self->camera_config);
@@ -135,6 +139,7 @@ extern void common_hal_espcamera_camera_deinit(espcamera_camera_obj_t *self) {
 
     common_hal_pwmio_pwmout_deinit(&self->pwm);
 
+    // Does nothing if pin is NO_PIN (-1).
     reset_pin_number(self->camera_config.pin_pwdn);
     reset_pin_number(self->camera_config.pin_reset);
     reset_pin_number(self->camera_config.pin_xclk);