From 9e65662a11c37599299ba4ab9c3ddf0510306498 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 14:00:01 +1000
Subject: [PATCH] esp32/boards: Set default I2C and SPI pins on UM_xxx boards.

And fix incorrect I2C and SPI pins in the feathers2 module.
---
 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py | 8 ++++----
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h      | 9 ++++++++-
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h       | 3 +++
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h         | 3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
index 32126fc9c9..93c50a1810 100644
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -22,12 +22,12 @@ DOTSTAR_DATA = const(40)
 
 # SPI
 SPI_MOSI = const(35)
-SPI_MISO = const(36)
-SPI_CLK = const(37)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
 
 # I2C
-I2C_SDA = const(38)
-I2C_SCL = const(33)
+I2C_SDA = const(8)
+I2C_SCL = const(9)
 
 # DAC
 DAC1 = const(17)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
index c045adccd9..8d0c9f78c8 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
@@ -2,4 +2,11 @@
 #define MICROPY_HW_MCU_NAME "ESP32-S2"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
\ No newline at end of file
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
+#define MICROPY_HW_SPI1_MOSI (35)  // SDO
+#define MICROPY_HW_SPI1_MISO (37)  // SDI
+#define MICROPY_HW_SPI1_SCK (36)
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
index 05ee5eaf72..6bf70cc13b 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
@@ -1,6 +1,9 @@
 #define MICROPY_HW_BOARD_NAME "TinyPICO"
 #define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
 
+#define MICROPY_HW_I2C0_SCL (22)
+#define MICROPY_HW_I2C0_SDA (21)
+
 #define MICROPY_HW_SPI1_SCK (18)
 #define MICROPY_HW_SPI1_MOSI (23)
 #define MICROPY_HW_SPI1_MISO (19)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
index 87d266e58c..1052f6d79c 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
@@ -4,6 +4,9 @@
 #define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
 #define MICROPY_HW_SPI1_MOSI (35)
 #define MICROPY_HW_SPI1_MISO (36)
 #define MICROPY_HW_SPI1_SCK (37)