8000 Merge remote-tracking branch 'adafruit/main' into bytearray_find · kvc0/circuitpython@1b3bc98 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1b3bc98

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into bytearray_find
2 parents 900edb2 + cb7df2e commit 1b3bc98

File tree

32 files changed

+326
-104
lines changed

32 files changed

+326
-104
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt-get install -y eatmydata
3939
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
40-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort
4141
- name: Versions
4242
run: |
4343
gcc --version

‎frozen/circuitpython-stage

‎main.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
9797
}
9898
}
9999

100+
#if MICROPY_ENABLE_PYSTACK
101+
static size_t PLACE_IN_DTCM_BSS(_pystack[CIRCUITPY_PYSTACK_SIZE / sizeof(size_t)]);
102+
#endif
103+
100104
void start_mp(supervisor_allocation* heap) {
101105
reset_status_led();
102106
autoreload_stop();
@@ -125,6 +129,10 @@ void start_mp(supervisor_allocation* heap) {
125129
// Clear the readline history. It references the heap we're about to destroy.
126130
readline_init0();
127131

132+
#if MICROPY_ENABLE_PYSTACK
133+
mp_pystack_init(_pystack, _pystack + (sizeof(_pystack) / sizeof(size_t)));
134+
#endif
135+
128136
#if MICROPY_ENABLE_GC
129137
gc_init(heap->ptr, heap->ptr + heap->length / 4);
130138
#endif

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1313
EXTERNAL_FLASH_DEVICES = GD25Q16C
1414
LONGINT_IMPL = MPZ
1515

16-
CIRCUITPY_NETWORK = 1
17-
MICROPY_PY_WIZNET5K = 5500
1816
CIRCUITPY_PS2IO = 1

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ EXTERNAL_FLASH_DEVICE_COUNT = 2
1111
EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ, S25FL064L"
1212
LONGINT_IMPL = MPZ
1313

14-
CIRCUITPY_NETWORK = 1
15-
MICROPY_PY_WIZNET5K = 5500
1614
CIRCUITPY_PS2IO = 1

‎ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ LONGINT_IMPL = MPZ
1313
CIRCUITPY_AUDIOBUSIO = 0
1414
CIRCUITPY_FRAMEBUFFERIO = 0
1515
CIRCUITPY_DISPLAYIO = 0
16-
CIRCUITPY_NETWORK = 0
1716
CIRCUITPY_RGBMATRIX = 0
1817
CIRCUITPY_PS2IO = 0
1918
CIRCUITPY_AUDIOMP3 = 0

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,32 @@ INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111

1212
CIRCUITPY_FULL_BUILD = 0
13-
# TODO: Turn off analogio for now for space reasons, but restore it
14-
# when frozen module gets smaller.
15-
CIRCUITPY_ANALOGIO = 0
1613
CIRCUITPY_AUDIOBUSIO = 0
14+
CIRCUITPY_AUDIOPWMIO = 0
15+
CIRCUITPY_AUDIOMP3 = 0
1716
CIRCUITPY_BITBANGIO = 0
17+
CIRCUITPY_BITBANG_APA102 = 0
1818
CIRCUITPY_FREQUENCYIO = 0
19+
CIRCUITPY_GAMEPADSHIFT = 0
1920
CIRCUITPY_I2CPERIPHERAL = 0
2021
CIRCUITPY_NEOPIXEL_WRITE = 0
21-
CIRCUITPY_NETWORK = 0
2222
CIRCUITPY_PIXELBUF = 0
2323
CIRCUITPY_PS2IO = 0
24+
CIRCUITPY_ROTARYIO = 0
2425
CIRCUITPY_RTC = 0
26+
CIRCUITPY_SAMD = 0
2527
CIRCUITPY_TOUCHIO = 0
2628
CIRCUITPY_USB_HID = 0
2729
CIRCUITPY_USB_MIDI = 0
28-
CIRCUITPY_AUDIOPWMIO = 0
29-
CIRCUITPY_AUDIOMP3 = 0
30-
CIRCUITPY_BITBANG_APA102 = 0
31-
CIRCUITPY_BLEIO = 0
32-
CIRCUITPY_GAMEPADSHIFT = 0
33-
CIRCUITPY_NETWORK = 0
34-
CIRCUITPY_ROTARYIO = 0
35-
CIRCUITPY_SAMD = 0
36-
CIRCUITPY_TOUCHIO = 0
3730
CIRCUITPY_VECTORIO = 0
3831

32+
CIRCUITPY_ANALOGIO = 1
3933
CIRCUITPY_AUDIOMIXER = 1
4034
CIRCUITPY_AUDIOIO = 1
4135
CIRCUITPY_DISPLAYIO = 1
4236
CIRCUITPY_GAMEPAD = 1
43-
CIRCUITPY_STAGE = 1
4437
CIRCUITPY_MATH = 1
38+
CIRCUITPY_STAGE = 1
4539

4640
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
4741
CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,4 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1212
EXTERNAL_FLASH_DEVICES = AT25SF041A
1313
LONGINT_IMPL = MPZ
1414

15-
CIRCUITPY_NETWORK = 1
16-
MICROPY_PY_WIZNET5K = 5500
1715
CIRCUITPY_PS2IO = 1

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

13-
# Tweak inlining depending on language.
14-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
13+
# Always use aggressive inlining
1514
CFLAGS_INLINE_LIMIT = 45
16-
else
17-
CFLAGS_INLINE_LIMIT = 70
18-
endif
15+
16+
SUPEROPT_GC = 0

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@ CIRCUITPY_BLEIO = 0
2424
CIRCUITPY_DISPLAYIO = 0
2525
CIRCUITPY_GAMEPAD = 0
2626
CIRCUITPY_I2CPERIPHERAL = 0
27-
CIRCUITPY_NETWORK = 0
2827
CIRCUITPY_TOUCHIO = 0
2928
CIRCUITPY_RGBMATRIX = 0
3029
CIRCUITPY_PS2IO = 0
3130
CIRCUITPY_USB_HID = 0
3231
CIRCUITPY_USB_MIDI = 0
3332
CIRCUITPY_RTC = 0
33+
34+
# Enable board-specific modules
35+
USER_C_MODULES = boards/winterbloom_big_honking_button/usermods
36+
CFLAGS += -DMODULE_BHB_ENABLED=1

0 commit comments

Comments
 (0)
0