Skip to content

Commit d426ba7

Browse files
authored
Merge branch 'adafruit:main' into m5timer
2 parents f63aac9 + f2bfced commit d426ba7

File tree

108 files changed

+3203
-1098
lines changed

Some content is hidden

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

108 files changed

+3203
-1098
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
TWINE_USERNAME: ${{ secrets.pypi_username }}
210210
TWINE_PASSWORD: ${{ secrets.pypi_password }}
211211
run: |
212-
# setup.py sdist was run by 'make stubs'
212+
# python -m build was run by 'make stubs'
213213
[ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
214214
[ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
215215

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,3 +338,6 @@
338338
[submodule "frozen/circuitpython-pcf85063a"]
339339
path = frozen/circuitpython-pcf85063a
340340
url = https://github.com/bablokb/circuitpython-pcf85063a
341+
[submodule "frozen/Adafruit_CircuitPython_Wave"]
342+
path = frozen/Adafruit_CircuitPython_Wave
343+
url = http://github.com/adafruit/Adafruit_CircuitPython_Wave.git

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ stubs:
266266
@cp setup.py-stubs circuitpython-stubs/setup.py
267267
@cp README.rst-stubs circuitpython-stubs/README.rst
268268
@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
269-
@(cd circuitpython-stubs && $(PYTHON) setup.py -q sdist)
269+
@$(PYTHON) -m build circuitpython-stubs
270270

271271
.PHONY: check-stubs
272272
check-stubs: stubs

docs/environment.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ CIRCUITPY_BLE_NAME
6060
~~~~~~~~~~~~~~~~~~
6161
Default BLE name the board advertises as, including for the BLE workflow.
6262

63+
CIRCUITPY_PYSTACK_SIZE
64+
~~~~~~~~~~~~~~~~~~~~~~
65+
Sets the size of the python stack. Must be a multiple of 4. The default value is currently 1536.
66+
Increasing the stack reduces the size of the heap available to python code.
67+
Used to avoid "Pystack exhausted" errors when the code can't be reworked to avoid it.
68+
6369
CIRCUITPY_RESERVED_PSRAM
6470
~~~~~~~~~~~~~~~~~~~~~~~~
6571
On boards with Espressif microcontrollers with PSRAM (also called SPIRAM), permanently reserve a portion of PSRAM for use by esp-idf.

locale/es.po

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2023-04-22 15:51+0000\n"
12-
"Last-Translator: Jose David M <jquintana202020@gmail.com>\n"
11+
"PO-Revision-Date: 2023-05-16 19:50+0000\n"
12+
"Last-Translator: Luis Ruiz San Segundo <luisan00@hotmail.com>\n"
1313
"Language-Team: \n"
1414
"Language: es\n"
1515
"MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@ msgstr "%q debe ser un bytearray o array de tipo 'H' o 'B'"
206206

207207
#: shared-bindings/audiocore/RawSample.c
208208
msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
209-
msgstr "%q debe ser un byte-matriz o matriz de tipo 'h', 'H', 'b', o 'B'"
209+
msgstr "%q debe ser un bytearray o array de tipo 'h', 'H', 'b', o 'B'"
210210

211211
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
212212
msgid "%q must be array of type 'H'"
@@ -601,8 +601,7 @@ msgstr "Por debajo de la tasa mínima de refrescamiento"
601601

602602
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
603603
msgid "Bit clock and word select must be sequential pins"
604-
msgstr ""
605-
"Los pines de reloj de bit y de selector de palabra deben ser secuenciales"
604+
msgstr "Los pines \"clock\" y \"word-select\" deben ser consecutivos"
606605

607606
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
608607
msgid "Bit clock and word select must share a clock unit"

main.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,10 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
666666
#endif
667667
{
668668
// Refresh the ePaper display if we have one. That way it'll show an error message.
669+
// Skip if we're about to autoreload. Otherwise we may delay when user code can update
670+
// the display.
669671
#if CIRCUITPY_DISPLAYIO
670-
if (time_to_epaper_refresh > 0) {
672+
if (time_to_epaper_refresh > 0 && !autoreload_pending()) {
671673
time_to_epaper_refresh = maybe_refresh_epaperdisplay();
672674
}
673675

ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
1414
CIRCUITPY_CANIO = 1
15+
CIRCUITPY_SYNTHIO = 0
1516

1617
CIRCUITPY_LTO_PARTITION = one

ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
14+
CIRCUITPY_SYNTHIO = 0

ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
14+
CIRCUITPY_SYNTHIO = 0

0 commit comments

Comments
 (0)