From 9aa151e3f355dea6e14d77053f40691365e60d96 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Wed, 1 Dec 2021 22:09:28 +0100 Subject: [PATCH] esp32/boards: Remove SPI pin defaults from GENERIC S2/S3 boards. Default SPI pins are now correctly assigned by machine_hw_spi.c even for S2 and S3. mpconfigboard.h files define defaults with flipped SPI(1) and SPI(2) to workaround a bug in machine_hw_spi.c - the bug is fixed. Signed-off-by: Tomas Vanek --- ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h | 7 ------- ports/esp32/boards/GENERIC_S3/mpconfigboard.h | 4 ---- ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h | 4 ---- 3 files changed, 15 deletions(-) diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h index f9219c8767..a96262c607 100644 --- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h +++ b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h @@ -6,10 +6,3 @@ #define MICROPY_HW_I2C0_SCL (7) #define MICROPY_HW_I2C0_SDA (6) - -#define MICROPY_HW_SPI1_MOSI (35) -#define MICROPY_HW_SPI1_MISO (37) -#define MICROPY_HW_SPI1_SCK (36) -#define MICROPY_HW_SPI2_MOSI (11) -#define MICROPY_HW_SPI2_MISO (13) -#define MICROPY_HW_SPI2_SCK (12) diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h index f41917ff07..3540e5a855 100644 --- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h +++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h @@ -5,7 +5,3 @@ #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) diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h index 10085ae789..beb796dd9e 100644 --- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h +++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h @@ -6,7 +6,3 @@ #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)