Skip to content

Commit 0bbb0f1

Browse files
FoamyGuyFoamyGuy
committed
Merge branch 'adafruit_main' into bitmaptools_paint_fill
2 parents fd372cf + 78f073c commit 0bbb0f1

File tree

118 files changed

+3595
-1111
lines changed

Some content is hidden

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

118 files changed

+3595
-1111
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ jobs:
232232
- "bdmicro_vina_d51_pcb7"
233233
- "bless_dev_board_multi_sensor"
234234
- "blm_badge"
235+
- "bluemicro840"
235236
- "capablerobot_usbhub"
236237
- "catwan_usbstick"
237238
- "circuitbrains_basic_m0"
@@ -325,11 +326,13 @@ jobs:
325326
- "pewpew10"
326327
- "pewpew_m4"
327328
- "picoplanet"
329+
- "pimoroni_interstate75"
328330
- "pimoroni_keybow2040"
329331
- "pimoroni_pga2040"
330332
- "pimoroni_picolipo_16mb"
331333
- "pimoroni_picolipo_4mb"
332334
- "pimoroni_picosystem"
335+
- "pimoroni_plasma2040"
333336
- "pimoroni_tiny2040"
334337
- "pitaya_go"
335338
- "pyb_nano_v2"
@@ -369,6 +372,7 @@ jobs:
369372
- "sparkfun_samd21_mini"
370373
- "sparkfun_samd51_micromod"
371374
- "sparkfun_samd51_thing_plus"
375+
- "sparkfun_stm32f405_micromod"
372376
- "sparkfun_thing_plus_rp2040"
373377
- "spresense"
374378
- "stackrduino_m0_pro"
@@ -460,7 +464,7 @@ jobs:
460464
- name: Install deps
461465
run: |
462466
sudo apt-get install -y gettext
463-
pip install requests sh click setuptools awscli
467+
pip install -r requirements-dev.txt
464468
wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
465469
sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
466470
- name: Versions
@@ -515,6 +519,7 @@ jobs:
515519
- "gravitech_cucumber_rs"
516520
- "lilygo_ttgo_t8_s2_st7789"
517521
- "microdev_micro_s2"
522+
- "morpheans_morphesp-240"
518523
- "muselab_nanoesp32_s2_wroom"
519524
- "muselab_nanoesp32_s2_wrover"
520525
- "targett_module_clip_wroom"

‎docs/redirects.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ shared-bindings/ustack/__init__.rst shared-bindings/ustack/
152152
shared-bindings/vectorio/Circle.rst shared-bindings/vectorio/#vectorio.Circle
153153
shared-bindings/vectorio/Polygon.rst shared-bindings/vectorio/#vectorio.Polygon
154154
shared-bindings/vectorio/Rectangle.rst shared-bindings/vectorio/#vectorio.Rectangle
155-
shared-bindings/vectorio/VectorShape.rst shared-bindings/vectorio/#vectorio.VectorShape
156155
shared-bindings/vectorio/__init__.rst shared-bindings/vectorio/
157156
shared-bindings/watchdog/WatchDogMode.rst shared-bindings/watchdog/#watchdog.WatchDogMode
158157
shared-bindings/watchdog/WatchDogTimer.rst shared-bindings/watchdog/#watchdog.WatchDogTimer

‎lib/utils/pyexec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
149149
mp_hal_stdout_tx_strn("\x04", 1);
150150
}
151151
// check for SystemExit
152-
if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
152+
if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
153153
// at the moment, the value of SystemExit is unused
154154
ret = pyexec_system_exit;
155155
#if CIRCUITPY_ALARM

‎locale/ID.po

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ msgstr ""
4242
"Harap ajukan masalah dengan konten drive CIRCUITPY Anda di\n"
4343
"https://github.com/adafruit/circuitpython/issues\n"
4444

45-
#: py/obj.c shared-bindings/traceback/__init__.c
45+
#: py/obj.c
4646
msgid " File \"%q\""
4747
msgstr " File \"%q\""
4848

49-
#: py/obj.c shared-bindings/traceback/__init__.c
49+
#: py/obj.c
5050
msgid " File \"%q\", line %d"
5151
msgstr " File \"%q\", baris %d"
5252

@@ -325,11 +325,15 @@ msgstr "'yield from' di dalam fungsi async"
325325
msgid "'yield' outside function"
326326
msgstr "'yield' diluar fungsi"
327327

328+
#: shared-module/vectorio/VectorShape.c
329+
msgid "(x,y) integers required"
330+
msgstr ""
331+
328332
#: py/compile.c
329333
msgid "*x must be assignment target"
330334
msgstr "*x harus menjadi target assignment"
331335

332-
#: py/obj.c shared-bindings/traceback/__init__.c
336+
#: py/obj.c
333337
msgid ", in %q\n"
334338
msgstr ", dalam %q\n"
335339

@@ -496,6 +500,10 @@ msgstr ""
496500
msgid "Attempted heap allocation when VM not running."
497501
msgstr ""
498502

503+
#: ports/raspberrypi/audio_dma.c
504+
msgid "Audio conversion not implemented"
505+
msgstr ""
506+
499507
#: shared-bindings/wifi/Radio.c
500508
msgid "AuthMode.OPEN is not used with password"
501509
msgstr ""
@@ -1233,6 +1241,10 @@ msgstr "Otentikasi tidak cukup"
12331241
msgid "Insufficient encryption"
12341242
msgstr "Enkripsi tidak cukup"
12351243

1244+
#: ports/raspberrypi/audio_dma.c
1245+
msgid "Internal audio buffer too small"
1246+
msgstr ""
1247+
12361248
#: ports/stm/common-hal/busio/UART.c
12371249
msgid "Internal define error"
12381250
msgstr "Kesalahan definisi internal"
@@ -2245,7 +2257,7 @@ msgstr ""
22452257
msgid "Touch alarms not available"
22462258
msgstr ""
22472259

2248-
#: py/obj.c shared-bindings/traceback/__init__.c
2260+
#: py/obj.c
22492261
msgid "Traceback (most recent call last):\n"
22502262
msgstr "Traceback (bagian terakhir dari panggilan terkini):\n"
22512263

@@ -3495,10 +3507,6 @@ msgstr ""
34953507
msgid "lhs and rhs should be compatible"
34963508
msgstr ""
34973509

3498-
#: shared-bindings/traceback/__init__.c
3499-
msgid "limit should be an int"
3500-
msgstr ""
3501-
35023510
#: py/emitnative.c
35033511
msgid "local '%q' has type '%q' but source is '%q'"
35043512
msgstr ""
@@ -3946,6 +3954,10 @@ msgstr ""
39463954
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
39473955
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
39483956
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
3957+
#: ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.h
3958+
#: ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.h
3959+
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
3960+
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39493961
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
39503962
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39513963
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
@@ -4144,7 +4156,7 @@ msgstr ""
41444156
msgid "stop not reachable from start"
41454157
msgstr ""
41464158

4147-
#: py/stream.c
4159+
#: py/stream.c shared-bindings/getpass/__init__.c
41484160
msgid "stream operation not supported"
41494161
msgstr ""
41504162

@@ -4353,7 +4365,7 @@ msgid "unreadable attribute"
43534365
msgstr ""
43544366

43554367
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4356-
#: shared-module/vectorio/Polygon.c
4368+
#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
43574369
msgid "unsupported %q type"
43584370
msgstr ""
43594371

‎locale/circuitpython.pot

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ msgid ""
3535
"https://github.com/adafruit/circuitpython/issues\n"
3636
msgstr ""
3737

38-
#: py/obj.c shared-bindings/traceback/__init__.c
38+
#: py/obj.c
3939
msgid " File \"%q\""
4040
msgstr ""
4141

42-
#: py/obj.c shared-bindings/traceback/__init__.c
42+
#: py/obj.c
4343
msgid " File \"%q\", line %d"
4444
msgstr ""
4545

@@ -318,11 +318,15 @@ msgstr ""
318318
msgid "'yield' outside function"
319319
msgstr ""
320320

321+
#: shared-module/vectorio/VectorShape.c
322+
msgid "(x,y) integers required"
323+
msgstr ""
324+
321325
#: py/compile.c
322326
msgid "*x must be assignment target"
323327
msgstr ""
324328

325-
#: py/obj.c shared-bindings/traceback/__init__.c
329+
#: py/obj.c
326330
msgid ", in %q\n"
327331
msgstr ""
328332

@@ -489,6 +493,10 @@ msgstr ""
489493
msgid "Attempted heap allocation when VM not running."
490494
msgstr ""
491495

496+
#: ports/raspberrypi/audio_dma.c
497+
msgid "Audio conversion not implemented"
498+
msgstr ""
499+
492500
#: shared-bindings/wifi/Radio.c
493501
msgid "AuthMode.OPEN is not used with password"
494502
msgstr ""
@@ -1213,6 +1221,10 @@ msgstr ""
12131221
msgid "Insufficient encryption"
12141222
msgstr ""
12151223

1224+
#: ports/raspberrypi/audio_dma.c
1225+
msgid "Internal audio buffer too small"
1226+
msgstr ""
1227+
12161228
#: ports/stm/common-hal/busio/UART.c
12171229
msgid "Internal define error"
12181230
msgstr ""
@@ -2211,7 +2223,7 @@ msgstr ""
22112223
msgid "Touch alarms not available"
22122224
msgstr ""
22132225

2214-
#: py/obj.c shared-bindings/traceback/__init__.c
2226+
#: py/obj.c
22152227
msgid "Traceback (most recent call last):\n"
22162228
msgstr ""
22172229

@@ -3453,10 +3465,6 @@ msgstr ""
34533465
msgid "lhs and rhs should be compatible"
34543466
msgstr ""
34553467

3456-
#: shared-bindings/traceback/__init__.c
3457-
msgid "limit should be an int"
3458-
msgstr ""
3459-
34603468
#: py/emitnative.c
34613469
msgid "local '%q' has type '%q' but source is '%q'"
34623470
msgstr ""
@@ -3903,6 +3911,10 @@ msgstr ""
39033911
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
39043912
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
39053913
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
3914+
#: ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.h
3915+
#: ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.h
3916+
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
3917+
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39063918
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
39073919
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39083920
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
@@ -4101,7 +4113,7 @@ msgstr ""
41014113
msgid "stop not reachable from start"
41024114
msgstr ""
41034115

4104-
#: py/stream.c
4116+
#: py/stream.c shared-bindings/getpass/__init__.c
41054117
msgid "stream operation not supported"
41064118
msgstr ""
41074119

@@ -4310,7 +4322,7 @@ msgid "unreadable attribute"
43104322
msgstr ""
43114323

43124324
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4313-
#: shared-module/vectorio/Polygon.c
4325+
#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
43144326
msgid "unsupported %q type"
43154327
msgstr ""
43164328

‎locale/cs.po

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ msgstr ""
3838
"Založte prosím problém s obsahem vaší jednotky CIRCUITPY na adrese\n"
3939
"https://github.com/adafruit/circuitpython/issues\n"
4040

41-
#: py/obj.c shared-bindings/traceback/__init__.c
41+
#: py/obj.c
4242
msgid " File \"%q\""
4343
msgstr " Soubor \"%q\""
4444

45-
#: py/obj.c shared-bindings/traceback/__init__.c
45+
#: py/obj.c
4646
msgid " File \"%q\", line %d"
4747
msgstr " Soubor \"%q\", řádek %d"
4848

@@ -321,11 +321,15 @@ msgstr ""
321321
msgid "'yield' outside function"
322322
msgstr ""
323323

324+
#: shared-module/vectorio/VectorShape.c
325+
msgid "(x,y) integers required"
326+
msgstr ""
327+
324328
#: py/compile.c
325329
msgid "*x must be assignment target"
326330
msgstr ""
327331

328-
#: py/obj.c shared-bindings/traceback/__init__.c
332+
#: py/obj.c
329333
msgid ", in %q\n"
330334
msgstr ""
331335

@@ -492,6 +496,10 @@ msgstr ""
492496
msgid "Attempted heap allocation when VM not running."
493497
msgstr ""
494498

499+
#: ports/raspberrypi/audio_dma.c
500+
msgid "Audio conversion not implemented"
501+
msgstr ""
502+
495503
#: shared-bindings/wifi/Radio.c
496504
msgid "AuthMode.OPEN is not used with password"
497505
msgstr ""
@@ -1216,6 +1224,10 @@ msgstr ""
12161224
msgid "Insufficient encryption"
12171225
msgstr ""
12181226

1227+
#: ports/raspberrypi/audio_dma.c
1228+
msgid "Internal audio buffer too small"
1229+
msgstr ""
1230+
12191231
#: ports/stm/common-hal/busio/UART.c
12201232
msgid "Internal define error"
12211233
msgstr ""
@@ -2214,7 +2226,7 @@ msgstr ""
22142226
msgid "Touch alarms not available"
22152227
msgstr ""
22162228

2217-
#: py/obj.c shared-bindings/traceback/__init__.c
2229+
#: py/obj.c
22182230
msgid "Traceback (most recent call last):\n"
22192231
msgstr ""
22202232

@@ -3456,10 +3468,6 @@ msgstr ""
34563468
msgid "lhs and rhs should be compatible"
34573469
msgstr ""
34583470

3459-
#: shared-bindings/traceback/__init__.c
3460-
msgid "limit should be an int"
3461-
msgstr ""
3462-
34633471
#: py/emitnative.c
34643472
msgid "local '%q' has type '%q' but source is '%q'"
34653473
msgstr ""
@@ -3906,6 +3914,10 @@ msgstr ""
39063914
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
39073915
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
39083916
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
3917+
#: ports/esp32s2/boards/gravitech_cucumber_m/mpconfigboard.h
3918+
#: ports/esp32s2/boards/gravitech_cucumber_ms/mpconfigboard.h
3919+
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
3920+
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39093921
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
39103922
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39113923
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
@@ -4104,7 +4116,7 @@ msgstr ""
41044116
msgid "stop not reachable from start"
41054117
msgstr ""
41064118

4107-
#: py/stream.c
4119+
#: py/stream.c shared-bindings/getpass/__init__.c
41084120
msgid "stream operation not supported"
41094121
msgstr ""
41104122

@@ -4313,7 +4325,7 @@ msgid "unreadable attribute"
43134325
msgstr ""
43144326

43154327
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4316-
#: shared-module/vectorio/Polygon.c
4328+
#: shared-module/vectorio/Polygon.c shared-module/vectorio/VectorShape.c
43174329
msgid "unsupported %q type"
43184330
msgstr ""
43194331

0 commit comments

Comments
 (0)