From 765eee424ecb9dbd8fad1fb8710012a214bdd0ff Mon Sep 17 00:00:00 2001 From: Durapensa Date: Fri, 3 Sep 2021 10:08:38 -0400 Subject: [PATCH] Lolin S2 Mini added I2C & SPI defs from Espressif MicroPython --- ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h | 12 ++++++------ ports/esp32s2/boards/lolin_s2_mini/pins.c | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h b/ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h index 411420d273..f72baabbd4 100644 --- a/ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h +++ b/ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h @@ -30,18 +30,18 @@ #define MICROPY_HW_MCU_NAME "ESP32S2" // #define MICROPY_HW_NEOPIXEL (&pin_GPIO1) // no NeoPixel on S2 Mini -#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO15) +// #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO15) #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0) #define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n") #define AUTORESET_DELAY_MS 500 -// #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9) // no I2C labels on S2 Mini -// #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) // no I2C labels on S2 Mini +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO35) // no I2C labels on S2 Mini, def from Espressif MP +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33) // no I2C labels on S2 Mini, def from Espressif MP -// #define DEFAULT_SPI_BUS_SCK (&pin_GPIO37) // no SPI labels on S2 Mini -// #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35) // no SPI labels on S2 Mini -// #define DEFAULT_SPI_BUS_MISO (&pin_GPIO36) // no SPI labels on S2 Mini +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO7) // no SPI labels on S2 Mini, def from Espressif MP +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11) // no SPI labels on S2 Mini, def from Espressif MP +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO9) // no SPI labels on S2 Mini, def from Espressif MP // #define DEFAULT_UART_BUS_RX (&pin_GPIO44) // no UART pins on S2 Mini // #define DEFAULT_UART_BUS_TX (&pin_GPIO43) // no UART pins on S2 Mini diff --git a/ports/esp32s2/boards/lolin_s2_mini/pins.c b/ports/esp32s2/boards/lolin_s2_mini/pins.c index cbf287ea96..9f8874651b 100644 --- a/ports/esp32s2/boards/lolin_s2_mini/pins.c +++ b/ports/esp32s2/boards/lolin_s2_mini/pins.c @@ -16,13 +16,16 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, // RTC_GPIO6,GPIO6,TOUCH6,ADC1_CH5 { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, // RTC_GPIO7,GPIO7,TOUCH7,ADC1_CH6 + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPI7) }, // def from Espressif MP, D1 Mini pin D5 GPIO14 // mpconfigboard.h: GPIO8/GPIO9: SCL/SDA I2C0 { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, // RTC_GPIO8,GPIO8,TOUCH8,ADC1_CH7 { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, // RTC_GPIO9,GPIO9,TOUCH9,ADC1_CH8,FSPIHD + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) }, // def from Espressif MP, D1 Mini pin D6 GPIO12 { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },// RTC_GPIO10,GPIO10,TOUCH10,ADC1_CH9,FSPICS0,FSPIIO4 { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },// RTC_GPIO11,GPIO11,TOUCH11,ADC2_CH0,FSPID,FSPIIO5 + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },// def from Espressif MP, D1 Mini pin D7 GPIRO13 { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },// RTC_GPIO12,GPIO12,TOUCH12,ADC2_CH1,FSPICLK,FSPIIO6 { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },// RTC_GPIO13,GPIO13,TOUCH13,ADC2_CH2,FSPIQ,FSPIIO7 @@ -46,10 +49,12 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { // GPIO33-GPIO40: broken out as a bloc on ESP32-S2FN4R2 SoC, last 2 half of JTAG { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },// SPIIO4,GPIO33,FSPIHD + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO33) },// def from Espressif MP, D1 Mini pin D2 GPIO4 { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },// SPIIO5,GPIO34,FSPICS0 // mpconfigboard.h: GPIO35/GPIO36/GPIO37: MOSI/MESO/SCK SPI { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },// SPIIO6,GPIO35,FSPID + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO35) },// def from Espressif MP, D1 Mini pin D1 GPIO5 { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },// SPIIO7,GPIO36,FSPICLK { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },// SPIDQS,GPIO37,FSPIQ