From dd266f2622ebb864342e75ca778e5a9ca9363626 Mon Sep 17 00:00:00 2001 From: ladyada Date: Tue, 18 Jul 2023 01:02:38 -0400 Subject: [PATCH] renamed since we are now s3 --- .../board.c | 0 .../mpconfigboard.h | 2 +- .../mpconfigboard.mk | 4 ++- .../pins.c | 0 .../sdkconfig | 29 +++++++++++++++---- 5 files changed, 27 insertions(+), 8 deletions(-) rename ports/espressif/boards/{adafruit_esp32s2_camera => adafruit_esp32s3_camera}/board.c (100%) rename ports/espressif/boards/{adafruit_esp32s2_camera => adafruit_esp32s3_camera}/mpconfigboard.h (97%) rename ports/espressif/boards/{adafruit_esp32s2_camera => adafruit_esp32s3_camera}/mpconfigboard.mk (79%) rename ports/espressif/boards/{adafruit_esp32s2_camera => adafruit_esp32s3_camera}/pins.c (100%) rename ports/espressif/boards/{adafruit_esp32s2_camera => adafruit_esp32s3_camera}/sdkconfig (61%) diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/board.c b/ports/espressif/boards/adafruit_esp32s3_camera/board.c similarity index 100% rename from ports/espressif/boards/adafruit_esp32s2_camera/board.c rename to ports/espressif/boards/adafruit_esp32s3_camera/board.c diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h b/ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.h similarity index 97% rename from ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h rename to ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.h index 64ab1b966d..8c0c9cdaae 100644 --- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h +++ b/ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.h @@ -27,7 +27,7 @@ // Micropython setup #define MICROPY_HW_BOARD_NAME "Adafruit Camera" -#define MICROPY_HW_MCU_NAME "ESP32S2" +#define MICROPY_HW_MCU_NAME "ESP32S3" #define MICROPY_HW_NEOPIXEL (&pin_GPIO21) #define MICROPY_HW_NEOPIXEL_COUNT (1) diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk similarity index 79% rename from ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk rename to ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk index 1823c1dd88..df7e62511a 100644 --- a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk @@ -3,8 +3,10 @@ USB_PID = 0x8118 USB_PRODUCT = "Camera" USB_MANUFACTURER = "Adafruit" -IDF_TARGET = esp32s2 +IDF_TARGET = esp32s3 CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 40m CIRCUITPY_ESP_FLASH_SIZE = 4MB + +CIRCUITPY_ESPCAMERA = 1 diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/pins.c b/ports/espressif/boards/adafruit_esp32s3_camera/pins.c similarity index 100% rename from ports/espressif/boards/adafruit_esp32s2_camera/pins.c rename to ports/espressif/boards/adafruit_esp32s3_camera/pins.c diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/sdkconfig b/ports/espressif/boards/adafruit_esp32s3_camera/sdkconfig similarity index 61% rename from ports/espressif/boards/adafruit_esp32s2_camera/sdkconfig rename to ports/espressif/boards/adafruit_esp32s3_camera/sdkconfig index 9d8bbde967..02056b1348 100644 --- a/ports/espressif/boards/adafruit_esp32s2_camera/sdkconfig +++ b/ports/espressif/boards/adafruit_esp32s3_camera/sdkconfig @@ -1,25 +1,32 @@ -CONFIG_ESP32S2_SPIRAM_SUPPORT=y +# Component config +# +# +# ESP32S3-Specific +# +CONFIG_ESP32S3_SPIRAM_SUPPORT=y # # SPI RAM config # -# CONFIG_SPIRAM_TYPE_AUTO is not set -CONFIG_SPIRAM_TYPE_ESPPSRAM16=y +CONFIG_SPIRAM_MODE_QUAD=y +# CONFIG_SPIRAM_MODE_OCT is not set +CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 # -# PSRAM clock and cs IO for ESP32S2 +# PSRAM Clock and CS IO for ESP32S3 # CONFIG_DEFAULT_PSRAM_CLK_IO=30 CONFIG_DEFAULT_PSRAM_CS_IO=26 -# end of PSRAM clock and cs IO for ESP32S2 +# end of PSRAM Clock and CS IO for ESP32S3 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set # CONFIG_SPIRAM_RODATA is not set # CONFIG_SPIRAM_SPEED_80M is not set -CONFIG_SPIRAM_SPEED_40M=y +CONFIG_SPIRAM_SPEED_80M=y # CONFIG_SPIRAM_SPEED_26M is not set # CONFIG_SPIRAM_SPEED_20M is not set CONFIG_SPIRAM=y @@ -31,3 +38,13 @@ CONFIG_SPIRAM_USE_MEMMAP=y CONFIG_SPIRAM_MEMTEST=y # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set # end of SPI RAM config + +# end of ESP32S3-Specific + +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP + +# end of Component config