Merge pull request adafruit#8218 from jepler/esp32-camera

Update the camera board to use ESP32-S3 microcontroller

Author: jepler

docs/shared_bindings_matrix.py

@@ -148,66 +148,36 @@ def get_board_mapping():
     return boards
 
 
-def read_mpconfig():
-    """Open 'circuitpy_mpconfig.mk' and return the contents."""
-    configs = []
-    cpy_mpcfg = get_circuitpython_root_dir() / "py" / "circuitpy_mpconfig.mk"
-    with open(cpy_mpcfg) as mpconfig:
-        configs = mpconfig.read()
-
-    return configs
-
-
 def build_module_map():
     """Establish the base of the JSON file, based on the contents from
-    `configs`. Base will contain module names, if they're part of
-    the `FULL_BUILD`, or their default value (0, 1, or a list of
-    modules that determine default [see audiocore, audiomixer, etc.]).
-
+    `configs`. Base contains the module name and the controlling C macro name.
     """
     base = dict()
     modules = get_bindings()
-    configs = read_mpconfig()
-    full_build = False
     for module in modules:
         full_name = module
         if module in ADDITIONAL_MODULES:
             search_identifier = ADDITIONAL_MODULES[module]
         else:
             search_identifier = "CIRCUITPY_" + module.lstrip("_").upper()
-        re_pattern = f"{re.escape(search_identifier)}\s*\??=\s*(.+)"
-        find_config = re.findall(re_pattern, configs)
-        if not find_config:
-            continue
-        find_config = ", ".join([x.strip("$()") for x in find_config])
-
-        full_build = int("CIRCUITPY_FULL_BUILD" in find_config)
-        if not full_build:
-            default_val = find_config
-        else:
-            default_val = "None"
 
         base[module] = {
             "name": full_name,
-            "full_build": str(full_build),
-            "default_value": default_val,
-            "excluded": {},
             "key": search_identifier,
         }
 
     return base
 
 
 def get_settings_from_makefile(port_dir, board_name):
-    """Invoke make in a mode which prints the database, then parse it for
-    settings.
+    """Invoke make to print the value of critical build settings
 
     This means that the effect of all Makefile directives is taken
     into account, without having to re-encode the logic that sets them
     in this script, something that has proved error-prone
     """
     contents = subprocess.run(
-        ["make", "-C", port_dir, f"BOARD={board_name}", "-qp", "print-CC"],
+        ["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS"],
         encoding="utf-8",
         errors="replace",
         stdout=subprocess.PIPE,
@@ -223,9 +193,10 @@ def get_settings_from_makefile(port_dir, board_name):
 
     settings = {}
     for line in contents.stdout.split("\n"):
-        # Handle both = and := definitions.
-        m = re.match(r"^([A-Z][A-Z0-9_]*) :?= (.*)$", line)
-        if m:
+        if line.startswith('CFLAGS ='):
+            for m in re.findall('-D([A-Z][A-Z0-9_]*)=(\d+)', line):
+                settings[m[0]] = m[1]
+        elif m := re.match(r"^([A-Z][A-Z0-9_]*) = (.*)$", line):
             settings[m.group(1)] = m.group(2)
 
     return settings
@@ -268,6 +239,10 @@ def get_repository_url(directory):
     repository_urls[directory] = path
     return path
 
+def remove_prefix(s, prefix):
+    if not s.startswith(prefix):
+        raise ValueError(f"{s=} does not start with {prefix=}")
+    return s.removeprefix(prefix)
 
 def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
     """
@@ -280,7 +255,8 @@ def frozen_modules_from_dirs(frozen_mpy_dirs, withurl):
     """
     frozen_modules = []
     for frozen_path in filter(lambda x: x, frozen_mpy_dirs.split(" ")):
-        source_dir = get_circuitpython_root_dir() / frozen_path[7:]
+        frozen_path = remove_prefix(frozen_path, '../../')
+        source_dir = get_circuitpython_root_dir() / frozen_path
         url_repository = get_repository_url(source_dir)
         for sub in source_dir.glob("*"):
             if sub.name in FROZEN_EXCLUDES:

ports/espressif/Makefile

@@ -330,13 +330,13 @@ $(BUILD)/esp-idf:
 TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
-	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
+	FLASH_SDKCONFIG ?= esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 else
 UF2_BOOTLOADER ?= $(CIRCUITPY_USB)
 ifeq ($(UF2_BOOTLOADER), 1)
-	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
+	FLASH_SDKCONFIG ?= esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 else
-	FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
+	FLASH_SDKCONFIG ?= esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
 endif
 endif
 

ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk

@@ -84,7 +84,7 @@ void board_init(void) {
         MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
         display_init_sequence,
         sizeof(display_init_sequence),
-        &pin_GPIO41,  // backlight pin
+        NULL,  // backlight pin
         NO_BRIGHTNESS_COMMAND,
         1.0f, // brightness
         false, // single_byte_bounds

ports/espressif/boards/adafruit_esp32s2_camera/sdkconfig

@@ -27,13 +27,11 @@
 // 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 (&pin_GPIO1)
 #define MICROPY_HW_NEOPIXEL_COUNT (1)
 
-#define MICROPY_HW_LED_STATUS (&pin_GPIO1)
-
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
 

ports/espressif/boards/adafruit_esp32s2_camera/board.c renamed to ports/espressif/boards/adafruit_esp32s3_camera/board.c

@@ -0,0 +1,21 @@
+USB_VID = 0x239A
+USB_PID = 0x8118
+USB_PRODUCT = "Camera"
+USB_MANUFACTURER = "Adafruit"
+
+IDF_TARGET = esp32s3
+
+CIRCUITPY_ESP_FLASH_MODE = dio
+CIRCUITPY_ESP_FLASH_FREQ = 40m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+FLASH_SDKCONFIG = esp-idf-config/sdkconfig-4MB-1ota.defaults
+
+CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_CANIO = 0
+CIRCUITPY_ESPCAMERA = 1
+CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
+CIRCUITPY_ONEWIREIO = 0
+CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_ROTARYIO = 0

ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h renamed to ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.h

@@ -24,21 +24,21 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO41) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
-    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO39) },
     { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
 
-    { MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO48) },
 
     { MP_ROM_QSTR(MP_QSTR_IRQ), MP_ROM_PTR(&pin_GPIO3) },
 
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO1) },
 
-    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO41) },
 
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_BATTERY_MONITOR), MP_ROM_PTR(&pin_GPIO4) },
 
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

@@ -0,0 +1,62 @@
+# Component config
+#
+#
+# ESP32S3-Specific
+#
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+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 ESP32S3
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# 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_80M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+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
+
+# CONFIG_OV7670_SUPPORT is not set
+# CONFIG_NT99141_SUPPORT is not set
+CONFIG_OV3360_SUPPORT=n
+# CONFIG_OV2640_SUPPORT is not set
+CONFIG_OV5640_SUPPORT=y
+# CONFIG_GC2145_SUPPORT is not set
+# CONFIG_GC032A_SUPPORT is not set
+# CONFIG_GC0308_SUPPORT is not set
+# CONFIG_BF3005_SUPPORT is not set
+# CONFIG_BF20A6_SUPPORT is not set
+# CONFIG_SC101IOT_SUPPORT is not set
+# CONFIG_SC030IOT_SUPPORT is not set
+# end of Component config

ports/espressif/boards/adafruit_esp32s2_camera/pins.c renamed to ports/espressif/boards/adafruit_esp32s3_camera/pins.c

@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,          0x8000, 4K
+
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    app,  ota_0,   0x10000,  2816K,
+uf2,      app,  factory,0x2d0000,  256K,
+ffat,     data, fat,    0x310000,  960K,

ports/espressif/boards/adafruit_esp32s3_camera/sdkconfig

@@ -0,0 +1,18 @@
+#
+# Serial flasher config
+#
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# end of Serial flasher config
+
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-1ota.csv"
+#
+# Partition Table
+#
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-1ota.csv"
+# end of Partition Table

ports/espressif/esp-idf-config/partitions-4MB-1ota.csv

@@ -14,11 +14,8 @@ CIRCUITPY_FULL_BUILD ?= 1
 CIRCUITPY_ALARM ?= 1
 CIRCUITPY_ANALOGBUFIO ?= 1
 CIRCUITPY_AUDIOBUSIO ?= 1
-CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
-CIRCUITPY_AUDIOCORE ?= 1
 CIRCUITPY_AUDIOIO ?= 0
-CIRCUITPY_AUDIOMIXER ?= 1
 CIRCUITPY_AUDIOMP3 ?= 0
 CIRCUITPY_BLEIO ?= 1
 CIRCUITPY_BLEIO_HCI = 0

ports/espressif/esp-idf-config/sdkconfig-4MB-1ota.defaults

@@ -73,7 +73,9 @@ def find_region(start_address):
                 ota = None
                 app = None
                 for partition in csv.reader(f):
-                    if partition[0][0] == "#":
+                    if not partition:  # empty row
+                        continue
+                    if partition[0].startswith("#"):
                         continue
                     subtype = partition[2].strip()
                     if subtype == "factory":