Merge pull request adafruit#8838 from bill88t/fbs3-i2c

dhalbert · web-flow · commit c09a4f9e86e3 · 2024-01-25T11:18:09.000-05:00
Correct Firebeetle 2 ESP32-S3's I2C
diff --git a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.h b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.h
@@ -27,9 +27,8 @@
 #define MICROPY_HW_BOARD_NAME       "DFRobot FireBeetle 2 ESP32-S3"
 #define MICROPY_HW_MCU_NAME         "ESP32S3"
 
-#define CIRCUITPY_BOARD_I2C         (2)
-#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO2, .sda = &pin_GPIO3}, \
-                                     {.scl = &pin_GPIO2, .sda = &pin_GPIO1}}
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO2, .sda = &pin_GPIO1}}
 
 #define DEFAULT_SPI_BUS_SCK (&pin_GPIO17)
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15)
diff --git a/ports/espressif/boards/firebeetle2_esp32s3/pins.c b/ports/espressif/boards/firebeetle2_esp32s3/pins.c
@@ -2,8 +2,6 @@
 #include "shared-bindings/board/__init__.h"
 #include "shared-module/displayio/__init__.h"
 
-CIRCUITPY_BOARD_BUS_SINGLETON(cam_i2c, i2c, 1) // Camera sensor
-
 STATIC const mp_rom_obj_tuple_t camera_data_tuple = {
     // The order matters.
     // They must be ordered from low to high (Y2, Y3 .. Y9).
@@ -43,9 +41,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SCL),      MP_ROM_PTR(&pin_GPIO2) },
 
     { MP_ROM_QSTR(MP_QSTR_IO1),      MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_SDA),      MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_SDA),      MP_ROM_PTR(&pin_GPIO1) },
 
-    // I2C cannot be used when CAM_I2C is in use.
     { MP_ROM_QSTR(MP_QSTR_I2C),  MP_ROM_PTR(&board_i2c_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_IO0),      MP_ROM_PTR(&pin_GPIO0) },
@@ -118,7 +115,5 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_CAM_HREF),  MP_ROM_PTR(&pin_GPIO42)},
     { MP_ROM_QSTR(MP_QSTR_CAM_PCLK),  MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_CAM_XCLK),  MP_ROM_PTR(&pin_GPIO45)},
-
-    { MP_ROM_QSTR(MP_QSTR_CAM_I2C),   MP_ROM_PTR(&board_cam_i2c_obj)},
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
