Skip to content

Commit ec067ae

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into nrf-usb-compliance-test
2 parents ec3dfed + fbb005b commit ec067ae

File tree

93 files changed

+709
-579
lines changed

Some content is hidden

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

93 files changed

+709
-579
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ jobs:
523523
- "gravitech_cucumber_r"
524524
- "gravitech_cucumber_rs"
525525
- "lilygo_ttgo_t8_s2_st7789"
526+
- "lolin_s2_mini"
526527
- "microdev_micro_s2"
527528
- "morpheans_morphesp-240"
528529
- "muselab_nanoesp32_s2_wroom"

‎docs/redirects.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ shared-bindings/displayio/Group.rst shared-bindings/displayio/#displayio.Group
7171
shared-bindings/displayio/I2CDisplay.rst shared-bindings/displayio/#displayio.I2CDisplay
7272
shared-bindings/displayio/OnDiskBitmap.rst shared-bindings/displayio/#displayio.OnDiskBitmap
7373
shared-bindings/displayio/Palette.rst shared-bindings/displayio/#displayio.Palette
74-
shared-bindings/displayio/ParallelBus.rst shared-bindings/displayio/#displayio.ParallelBus
74+
shared-bindings/paralleldisplay/ParallelBus.rst shared-bindings/paralleldisplay/#paralleldisplay.ParallelBus
7575
shared-bindings/displayio/Shape.rst shared-bindings/displayio/#displayio.Shape
7676
shared-bindings/displayio/TileGrid.rst shared-bindings/displayio/#displayio.TileGrid
7777
shared-bindings/displayio/__init__.rst shared-bindings/displayio/

‎frozen/circuitpython-stage

‎lib/utils/pyexec.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,21 @@ int pyexec_friendly_repl(void) {
650650
}
651651

652652
vstr_reset(&line);
653-
int ret = readline(&line, ">>> ");
653+
654+
nlr_buf_t nlr;
655+
nlr.ret_val = NULL;
656+
int ret = 0;
657+
if (nlr_push(&nlr) == 0) {
658+
ret = readline(&line, ">>> ");
659+
} else {
660+
// Uncaught exception
661+
mp_handle_pending(false); // clear any pending exceptions (and run any callbacks)
662+
663+
// Print exceptions but stay in the REPL. There are very few delayed
664+
// exceptions. The WatchDogTimer can raise one though.
665+
mp_hal_stdout_tx_str("\r\n");
666+
mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
667+
}
654668
mp_parse_input_kind_t parse_input_kind = MP_PARSE_SINGLE_INPUT;
655669

656670
if (ret == CHAR_CTRL_A) {

‎locale/circuitpython.pot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3939,6 +3939,7 @@ msgstr ""
39393939
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
39403940
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39413941
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
3942+
#: ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h
39423943
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39433944
#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h
39443945
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CIRCUITPY_USB_MIDI = 0
2020
# So not all of displayio, sorry!
2121
CIRCUITPY_VECTORIO = 0
2222
CIRCUITPY_BITMAPTOOLS = 0
23+
CIRCUITPY_PARALLELDISPLAY = 0
2324

2425
# Include these Python libraries in firmware.
2526
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground

‎ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CIRCUITPY_BITBANG_APA102 = 0
2020
CIRCUITPY_FREQUENCYIO = 0
2121
CIRCUITPY_I2CPERIPHERAL = 0
2222
CIRCUITPY_NEOPIXEL_WRITE = 0
23+
CIRCUITPY_PARALLELDISPLAY = 0
2324
CIRCUITPY_PIXELBUF = 0
2425
CIRCUITPY_PS2IO = 0
2526
CIRCUITPY_PULSEIO = 0

‎ports/atmel-samd/boards/pyportal/board.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ uint8_t display_init_sequence[] = {
6161
};
6262

6363
void board_init(void) {
64-
displayio_parallelbus_obj_t *bus = &displays[0].parallel_bus;
65-
bus->base.type = &displayio_parallelbus_type;
66-
common_hal_displayio_parallelbus_construct(bus,
64+
paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
65+
bus->base.type = &paralleldisplay_parallelbus_type;
66+
common_hal_paralleldisplay_parallelbus_construct(bus,
6767
&pin_PA16, // Data0
6868
&pin_PB05, // Command or data
6969
&pin_PB06, // Chip select

‎ports/atmel-samd/boards/pyportal_titano/board.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ uint8_t display_init_sequence[] = {
7878
};
7979

8080
void board_init(void) {
81-
displayio_parallelbus_obj_t *bus = &displays[0].parallel_bus;
82-
bus->base.type = &displayio_parallelbus_type;
83-
common_hal_displayio_parallelbus_construct(bus,
81+
paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
82+
bus->base.type = &paralleldisplay_parallelbus_type;
83+
common_hal_paralleldisplay_parallelbus_construct(bus,
8484
&pin_PA16, // Data0
8585
&pin_PB05, // Command or data
8686
&pin_PB06, // Chip select

‎ports/atmel-samd/boards/ugame10/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0
2424
CIRCUITPY_FREQUENCYIO = 0
2525
CIRCUITPY_I2CPERIPHERAL = 0
2626
CIRCUITPY_NEOPIXEL_WRITE = 0
27+
CIRCUITPY_PARALLELDISPLAY = 0
2728
CIRCUITPY_PIXELBUF = 0
2829
CIRCUITPY_RTC = 0
2930
CIRCUITPY_TOUCHIO = 0

0 commit comments

Comments
 (0)