Merge pull request #9132 from mariopesch/main

Update I2C implementation for senseBox MCU-S2 ESP32S2

Author: dhalbert

ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.h

@@ -31,15 +31,20 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO1)
 
+#define CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP 1
 
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO40)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO39)
-
+#define CIRCUITPY_BOARD_I2C         (2)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO40, .sda = &pin_GPIO39}, \
+                                     {.scl = &pin_GPIO42, .sda = &pin_GPIO45}}
 #define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
 #define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
 
 #define DEFAULT_UART_BUS_RX (&pin_GPIO44)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO43)
 
-#define DOUBLE_TAP_PIN (&pin_GPIO0)
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO36, .mosi = &pin_GPIO35, .miso = &pin_GPIO37}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO43, .rx = &pin_GPIO44}}

ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk

@@ -11,6 +11,8 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 
 CIRCUITPY_ESPCAMERA = 0
 
+CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
+CIRCUITPY_I2C_ALLOW_STRAPPING_PINS = 1
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

ports/espressif/common-hal/busio/I2C.c

@@ -40,9 +40,15 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     // support I2C on these pins.
     //
     // 46 is also input-only so it'll never work.
+    #if CIRCUITPY_I2C_ALLOW_STRAPPING_PINS
+    if (scl->number == 46 || sda->number == 46) {
+        raise_ValueError_invalid_pins();
+    }
+    #else
     if (scl->number == 45 || scl->number == 46 || sda->number == 45 || sda->number == 46) {
         raise_ValueError_invalid_pins();
     }
+    #endif
 
     #if CIRCUITPY_REQUIRE_I2C_PULLUPS
     // Test that the pins are in a high state. (Hopefully indicating they are pulled up.)

py/circuitpy_mpconfig.mk

@@ -428,6 +428,10 @@ CFLAGS += -DCIRCUITPY_RE=$(CIRCUITPY_RE)
 CIRCUITPY_REQUIRE_I2C_PULLUPS ?= 1
 CFLAGS += -DCIRCUITPY_REQUIRE_I2C_PULLUPS=$(CIRCUITPY_REQUIRE_I2C_PULLUPS)
 
+# Allow the use of strapping pins for i2c
+CIRCUITPY_I2C_ALLOW_STRAPPING_PINS ?= 0
+CFLAGS += -DCIRCUITPY_I2C_ALLOW_STRAPPING_PINS=$(CIRCUITPY_I2C_ALLOW_STRAPPING_PINS)
+
 # CIRCUITPY_RP2PIO is handled in the raspberrypi tree.
 # Only for rp2 chips.
 # Assume not a rp2 build.