From 63fc550baec373ad09d250cd72771789c32fadf8 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Fri, 17 Nov 2023 02:44:46 +0200 Subject: [PATCH 01/10] FireBeetle 2 ESP32-S3 --- .../boards/firebeetle2_esp32s3/board.c | 44 +++++++ .../firebeetle2_esp32s3/mpconfigboard.h | 45 +++++++ .../firebeetle2_esp32s3/mpconfigboard.mk | 14 +++ .../boards/firebeetle2_esp32s3/pins.c | 119 ++++++++++++++++++ .../boards/firebeetle2_esp32s3/sdkconfig | 15 +++ 5 files changed, 237 insertions(+) create mode 100644 ports/espressif/boards/firebeetle2_esp32s3/board.c create mode 100644 ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.h create mode 100644 ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk create mode 100644 ports/espressif/boards/firebeetle2_esp32s3/pins.c create mode 100644 ports/espressif/boards/firebeetle2_esp32s3/sdkconfig diff --git a/ports/espressif/boards/firebeetle2_esp32s3/board.c b/ports/espressif/boards/firebeetle2_esp32s3/board.c new file mode 100644 index 0000000000..63e5a51282 --- /dev/null +++ b/ports/espressif/boards/firebeetle2_esp32s3/board.c @@ -0,0 +1,44 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2023 Bill Sideris, independently providing these changes. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" + +// bool espressif_board_reset_pin_number(gpio_num_t pin_number) { +// if (pin_number == 47) { +// /* +// * Turn on PWR by default, +// * so that the board does not power off +// * when usb is disconnected or +// * the power button is released. +// */ +// gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT); +// gpio_set_level(pin_number, true); +// return true; +// } +// return false; +// } + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.h b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.h new file mode 100644 index 0000000000..674389528e --- /dev/null +++ b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.h @@ -0,0 +1,45 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2023 Bill Sideris, independently providing these changes. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#define MICROPY_HW_BOARD_NAME "DFRobot FireBeetle 2 ESP32-S3" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define CIRCUITPY_BOARD_I2C (2) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO2, .sda = &pin_GPIO3}, \ + {.scl = &pin_GPIO2, .sda = &pin_GPIO1}} + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO17) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16) + +#define MICROPY_HW_LED_STATUS (&pin_GPIO21) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO44) +#define DEFAULT_UART_BUS_TX (&pin_GPIO43) + +#define DOUBLE_TAP_PIN (&pin_GPIO0) + +#define CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP (1) diff --git a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk new file mode 100644 index 0000000000..a3da5449da --- /dev/null +++ b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk @@ -0,0 +1,14 @@ +USB_VID = 0x3343 +USB_PID = 0x83CF +USB_PRODUCT = "Firebeetle 2 ESP32-S3" +USB_MANUFACTURER = "DFRobot" + +IDF_TARGET = esp32s3 + +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB + +CIRCUITPY_ESP_PSRAM_SIZE = 8MB +CIRCUITPY_ESP_PSRAM_MODE = opi +CIRCUITPY_ESP_PSRAM_FREQ = 120m diff --git a/ports/espressif/boards/firebeetle2_esp32s3/pins.c b/ports/espressif/boards/firebeetle2_esp32s3/pins.c new file mode 100644 index 0000000000..bca5f9d511 --- /dev/null +++ b/ports/espressif/boards/firebeetle2_esp32s3/pins.c @@ -0,0 +1,119 @@ +#include "py/objtuple.h" +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +CIRCUITPY_BOARD_BUS_SINGLETON(cam_i2c, i2c, 1) // Camera sensor + +STATIC const mp_rom_obj_tuple_t camera_data_tuple = { + // The order matters. + // They must be ordered from low to high (Y2, Y3 .. Y9). + + // Do not include any of the control pins in here. + {&mp_type_tuple}, + 8, + { + MP_ROM_PTR(&pin_GPIO39), // Y2 + MP_ROM_PTR(&pin_GPIO40), // Y3 + MP_ROM_PTR(&pin_GPIO41), // Y4 + MP_ROM_PTR(&pin_GPIO4), // Y5 + MP_ROM_PTR(&pin_GPIO7), // Y6 + MP_ROM_PTR(&pin_GPIO8), // Y7 + MP_ROM_PTR(&pin_GPIO46), // Y8 + MP_ROM_PTR(&pin_GPIO48) // Y9 + } +}; + + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // Left header, module facing down. + { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17)}, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO17)}, + + { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15)}, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15)}, + + { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16)}, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO16)}, + + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO9) }, + + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18)}, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO18)}, + + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38)}, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO38)}, + + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43)}, + { MP_ROM_QSTR(MP_QSTR_TXD), MP_ROM_PTR(&pin_GPIO43)}, + + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44)}, + { MP_ROM_QSTR(MP_QSTR_RXD), MP_ROM_PTR(&pin_GPIO44)}, + + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj)}, + + // Right header, module facing down. + { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47)}, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO47)}, + { MP_ROM_QSTR(MP_QSTR_PWR), MP_ROM_PTR(&pin_GPIO12)}, + + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11)}, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11)}, + + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10)}, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO10)}, + + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8)}, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO8)}, + + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6)}, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO6)}, + + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5)}, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO5)}, + + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21)}, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO21)}, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21)}, + + { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12)}, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12)}, + + { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13)}, + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO13)}, + + { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14)}, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO14)}, + + // Camera data + { MP_ROM_QSTR(MP_QSTR_CAM_DATA), MP_ROM_PTR(&camera_data_tuple)}, + + { MP_ROM_QSTR(MP_QSTR_CAM_VSYNC), MP_ROM_PTR(&pin_GPIO6)}, + { MP_ROM_QSTR(MP_QSTR_CAM_HREF), MP_ROM_PTR(&pin_GPIO42)}, + { MP_ROM_QSTR(MP_QSTR_CAM_PCLK), MP_ROM_PTR(&pin_GPIO5)}, + + { MP_ROM_QSTR(MP_QSTR_CAM_I2C), MP_ROM_PTR(&board_cam_i2c_obj)}, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig b/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig new file mode 100644 index 0000000000..f5ef797681 --- /dev/null +++ b/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig @@ -0,0 +1,15 @@ +# +# Espressif IoT Development Framework Configuration +# +# +# Component config +# +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP + +# end of Component config + +# end of Espressif IoT Development Framework Configuration From 9328b45d2dbef742c35bfde03f7599d20aecd0a1 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Fri, 17 Nov 2023 18:47:50 +0200 Subject: [PATCH 02/10] Fix PWR pin and add xclk --- ports/espressif/boards/firebeetle2_esp32s3/pins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/espressif/boards/firebeetle2_esp32s3/pins.c b/ports/espressif/boards/firebeetle2_esp32s3/pins.c index bca5f9d511..c64d00ec8f 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/pins.c +++ b/ports/espressif/boards/firebeetle2_esp32s3/pins.c @@ -77,7 +77,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { // Right header, module facing down. { MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47)}, { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO47)}, - { MP_ROM_QSTR(MP_QSTR_PWR), MP_ROM_PTR(&pin_GPIO12)}, + { MP_ROM_QSTR(MP_QSTR_PWR), MP_ROM_PTR(&pin_GPIO47)}, { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11)}, { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11)}, @@ -113,6 +113,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_CAM_VSYNC), MP_ROM_PTR(&pin_GPIO6)}, { MP_ROM_QSTR(MP_QSTR_CAM_HREF), MP_ROM_PTR(&pin_GPIO42)}, { MP_ROM_QSTR(MP_QSTR_CAM_PCLK), MP_ROM_PTR(&pin_GPIO5)}, + { MP_ROM_QSTR(MP_QSTR_CAM_XCLK), MP_ROM_PTR(&pin_GPIO45)}, { MP_ROM_QSTR(MP_QSTR_CAM_I2C), MP_ROM_PTR(&board_cam_i2c_obj)}, }; From 40c152af9fe40ccf65a5fc466ec4feaf5417c694 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Fri, 17 Nov 2023 20:43:59 +0200 Subject: [PATCH 03/10] Add the proper cameras --- ports/espressif/boards/firebeetle2_esp32s3/sdkconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig b/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig index f5ef797681..6c5d1f1986 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig +++ b/ports/espressif/boards/firebeetle2_esp32s3/sdkconfig @@ -8,6 +8,8 @@ # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +CONFIG_OV2640_SUPPORT=y +CONFIG_OV7725_SUPPORT=y # end of LWIP # end of Component config From a05259db00a129fc7b432661e70ff63b8c72b8df Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Sat, 18 Nov 2023 13:09:01 +0200 Subject: [PATCH 04/10] Add CircuitPython_AXP313A --- .gitmodules | 3 +++ frozen/CircuitPython_AXP313A | 1 + ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk | 2 ++ 3 files changed, 6 insertions(+) create mode 160000 frozen/CircuitPython_AXP313A diff --git a/.gitmodules b/.gitmodules index 72a0094352..7f36fab08d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -354,3 +354,6 @@ [submodule "lib/tlsf"] path = lib/tlsf url = https://github.com/espressif/tlsf.git +[submodule "frozen/CircuitPython_AXP313A"] + path = frozen/CircuitPython_AXP313A + url = https://github.com/bill88t/CircuitPython_AXP313A diff --git a/frozen/CircuitPython_AXP313A b/frozen/CircuitPython_AXP313A new file mode 160000 index 0000000000..5e19e23087 --- /dev/null +++ b/frozen/CircuitPython_AXP313A @@ -0,0 +1 @@ +Subproject commit 5e19e230877ca79736e26f8f82ab12f18171b7cb diff --git a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk index a3da5449da..9da52eb812 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk +++ b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk @@ -12,3 +12,5 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB CIRCUITPY_ESP_PSRAM_SIZE = 8MB CIRCUITPY_ESP_PSRAM_MODE = opi CIRCUITPY_ESP_PSRAM_FREQ = 120m + +FROZEN_MPY_DIRS += $(TOP)/frozen/CircuitPython_AXP313A From dc031fcee7ded7deed2290663b280db2ef47cc25 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Sat, 18 Nov 2023 13:32:27 +0200 Subject: [PATCH 05/10] Update CircuitPython_AXP313A --- frozen/CircuitPython_AXP313A | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/CircuitPython_AXP313A b/frozen/CircuitPython_AXP313A index 5e19e23087..896695d30c 160000 --- a/frozen/CircuitPython_AXP313A +++ b/frozen/CircuitPython_AXP313A @@ -1 +1 @@ -Subproject commit 5e19e230877ca79736e26f8f82ab12f18171b7cb +Subproject commit 896695d30c0b19b9974794dfb889675120a1bd5d From 4934ae2954b0a0f485776c178b4bb2a22d2d15a8 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Sat, 18 Nov 2023 13:44:09 +0200 Subject: [PATCH 06/10] Introduce some comments and formatting changes to escape ci bug --- .../boards/firebeetle2_esp32s3/pins.c | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ports/espressif/boards/firebeetle2_esp32s3/pins.c b/ports/espressif/boards/firebeetle2_esp32s3/pins.c index c64d00ec8f..9c22a6355a 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/pins.c +++ b/ports/espressif/boards/firebeetle2_esp32s3/pins.c @@ -16,8 +16,8 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { MP_ROM_PTR(&pin_GPIO40), // Y3 MP_ROM_PTR(&pin_GPIO41), // Y4 MP_ROM_PTR(&pin_GPIO4), // Y5 - MP_ROM_PTR(&pin_GPIO7), // Y6 - MP_ROM_PTR(&pin_GPIO8), // Y7 + MP_ROM_PTR(&pin_GPIO7), // Y6 + MP_ROM_PTR(&pin_GPIO8), // Y7 MP_ROM_PTR(&pin_GPIO46), // Y8 MP_ROM_PTR(&pin_GPIO48) // Y9 } @@ -45,6 +45,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) }, + // I2C cannot be used when CAM_I2C is in use. { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, @@ -85,14 +86,14 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10)}, { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO10)}, - { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8)}, - { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO8)}, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO8) }, - { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6)}, - { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO6)}, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO6) }, - { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5)}, - { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO5)}, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21)}, { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO21)}, @@ -110,9 +111,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { // Camera data { MP_ROM_QSTR(MP_QSTR_CAM_DATA), MP_ROM_PTR(&camera_data_tuple)}, - { MP_ROM_QSTR(MP_QSTR_CAM_VSYNC), MP_ROM_PTR(&pin_GPIO6)}, + { MP_ROM_QSTR(MP_QSTR_CAM_VSYNC), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_CAM_HREF), MP_ROM_PTR(&pin_GPIO42)}, - { MP_ROM_QSTR(MP_QSTR_CAM_PCLK), MP_ROM_PTR(&pin_GPIO5)}, + { MP_ROM_QSTR(MP_QSTR_CAM_PCLK), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_CAM_XCLK), MP_ROM_PTR(&pin_GPIO45)}, { MP_ROM_QSTR(MP_QSTR_CAM_I2C), MP_ROM_PTR(&board_cam_i2c_obj)}, From 6fd2b62d60b48bded98c2dff39282dda7d79764a Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Sun, 19 Nov 2023 19:18:34 +0200 Subject: [PATCH 07/10] Update CircuitPython_AXP313A --- frozen/CircuitPython_AXP313A | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/CircuitPython_AXP313A b/frozen/CircuitPython_AXP313A index 896695d30c..e60eed58f2 160000 --- a/frozen/CircuitPython_AXP313A +++ b/frozen/CircuitPython_AXP313A @@ -1 +1 @@ -Subproject commit 896695d30c0b19b9974794dfb889675120a1bd5d +Subproject commit e60eed58f2acf5873e36f2c6774712b950e3ae93 From 9bc3fe0dd5d52c01c4ad95ebc2909a2a9ea890e3 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Tue, 21 Nov 2023 05:06:59 +0200 Subject: [PATCH 08/10] Update CircuitPython_AXP313A --- frozen/CircuitPython_AXP313A | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/CircuitPython_AXP313A b/frozen/CircuitPython_AXP313A index e60eed58f2..44703e1d66 160000 --- a/frozen/CircuitPython_AXP313A +++ b/frozen/CircuitPython_AXP313A @@ -1 +1 @@ -Subproject commit e60eed58f2acf5873e36f2c6774712b950e3ae93 +Subproject commit 44703e1d66ac2b1394a49adb697b4576fee4a991 From d467ef3f0bb54be99a01951b675d35ecdc8571be Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Tue, 21 Nov 2023 14:32:12 +0200 Subject: [PATCH 09/10] Remove unused pin-init for fbs3 It's co-commit time. Co-authored-by: Dan Halbert --- .../espressif/boards/firebeetle2_esp32s3/board.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ports/espressif/boards/firebeetle2_esp32s3/board.c b/ports/espressif/boards/firebeetle2_esp32s3/board.c index 63e5a51282..70ff11b067 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/board.c +++ b/ports/espressif/boards/firebeetle2_esp32s3/board.c @@ -26,19 +26,4 @@ #include "supervisor/board.h" -// bool espressif_board_reset_pin_number(gpio_num_t pin_number) { -// if (pin_number == 47) { -// /* -// * Turn on PWR by default, -// * so that the board does not power off -// * when usb is disconnected or -// * the power button is released. -// */ -// gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT); -// gpio_set_level(pin_number, true); -// return true; -// } -// return false; -// } - // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. From 71f953e9069fc0190346b6c69aedc73c1121ec65 Mon Sep 17 00:00:00 2001 From: Bill Sideris Date: Tue, 21 Nov 2023 14:48:29 +0200 Subject: [PATCH 10/10] Update CircuitPython_AXP313A --- frozen/CircuitPython_AXP313A | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frozen/CircuitPython_AXP313A b/frozen/CircuitPython_AXP313A index 44703e1d66..702d313bd2 160000 --- a/frozen/CircuitPython_AXP313A +++ b/frozen/CircuitPython_AXP313A @@ -1 +1 @@ -Subproject commit 44703e1d66ac2b1394a49adb697b4576fee4a991 +Subproject commit 702d313bd2eaa6895924c7eeda7dea74c4e35c69