Skip to content

Commit 9f1d526

Browse files
dhalbertdhalbert
committed
merge from 8.2.x
2 parents 843fca1 + 09329fe commit 9f1d526

File tree

92 files changed

+33
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+33
-732
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146146
branch = release/v4.4-circuitpython
147-
[submodule "ports/espressif/certificates/nina-fw"]
148-
path = lib/certificates/nina-fw
149-
url = https://github.com/adafruit/nina-fw.git
150147
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
151148
path = frozen/Adafruit_CircuitPython_ST7789
152149
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
@@ -345,3 +342,6 @@
345342
path = ports/raspberrypi/lib/Pico-PIO-USB
346343
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
347344
branch = main
345+
[submodule "lib/certificates"]
346+
path = lib/certificates
347+
url = https://github.com/adafruit/certificates

‎lib/certificates‎

Submodule certificates added at cbb33c1

‎lib/certificates/README.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎lib/certificates/nina-fw‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/protomatter‎

‎ports/espressif/boards/adafruit_funhouse/board.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ uint8_t display_init_sequence[] = {
5050
};
5151

5252
void board_init(void) {
53-
// Debug UART
54-
#ifdef DEBUG
55-
common_hal_never_reset_pin(&pin_GPIO37);
56-
common_hal_never_reset_pin(&pin_GPIO38);
57-
#endif /* DEBUG */
58-
5953
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
6054
busio_spi_obj_t *spi = &bus->inline_bus;
6155
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);

‎ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
1212
CIRCUITPY_ESPCAMERA = 0
1313

1414
# Include these Python libraries in firmware.
15-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
16-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
17-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
1815
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
19-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text

‎ports/espressif/boards/adafruit_funhouse/pins.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4444
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
4545
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO34) },
4646

47-
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO37) },
48-
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO38) },
47+
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO43) },
48+
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO44) },
4949

5050
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
5151
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ const uint8_t refresh_sequence[] = {
114114
};
115115

116116
void board_init(void) {
117-
// Debug UART
118-
#ifdef DEBUG
119-
common_hal_never_reset_pin(&pin_GPIO43);
120-
common_hal_never_reset_pin(&pin_GPIO44);
121-
#endif /* DEBUG */
122-
123117
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
124118
busio_spi_obj_t *spi = &bus->inline_bus;
125119
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);

‎ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/board.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,5 @@
2525
*/
2626

2727
#include "supervisor/board.h"
28-
#include "mpconfigboard.h"
29-
#include "shared-bindings/microcontroller/Pin.h"
30-
31-
void board_init(void) {
32-
// Debug UART
33-
#ifdef DEBUG
34-
common_hal_never_reset_pin(&pin_GPIO43);
35-
common_hal_never_reset_pin(&pin_GPIO44);
36-
#endif
37-
}
3828

3929
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

0 commit comments

Comments
 (0)