Skip to content

Commit 2b36014

Browse files
bablokbbablokb
committed
Merge branch 'main' into badger_2040_w
2 parents 5ab3b7d + a8ea8ea commit 2b36014

File tree

121 files changed

+2790
-641
lines changed

Some content is hidden

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

121 files changed

+2790
-641
lines changed

‎.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ repos:
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer
11-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
11+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
1212
- id: trailing-whitespace
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
1414
- repo: https://github.com/codespell-project/codespell
1515
rev: v2.2.4
1616
hooks:

‎Makefile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,24 @@ clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326326

327-
# Do blobless partial clones of submodules to save time and space.
327+
# If available, do blobless partial clones of submodules to save time and space.
328328
# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
329329
# so it does not have the idiosyncrasies of a shallow clone.
330+
#
331+
# If not available, do a fetch that will fail, and then fix it up with a second fetch.
332+
# (Only works for git servers that allow sha fetches.)
330333
.PHONY: fetch-submodules
331334
fetch-submodules:
332-
git submodule update --init --filter=blob:none
335+
git submodule sync
336+
#####################################################################################
337+
# NOTE: Ideally, use git version 2.36.0 or later, to do partial clones of submodules.
338+
# If an older git is used, submodules will be cloned with a shallow clone of depth 1.
339+
# You will see a git usage message first if the git version is too old to do
340+
# clones of submodules.
341+
#####################################################################################
342+
git submodule update --init --filter=blob:none || git submodule update --init -N --depth 1 || git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1' || echo 'make fetch-submodules FAILED'
343+
344+
.PHONY: remove-submodules
345+
remove-submodules:
346+
git submodule deinit -f --all
347+
rm -rf .git/modules/*

‎conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
extensions = [
7878
'sphinx.ext.autodoc',
7979
'sphinx.ext.doctest',
80+
"sphinxcontrib.jquery",
8081
'sphinxcontrib.rsvgconverter',
8182
'sphinx.ext.intersphinx',
8283
'sphinx.ext.todo',

‎locale/ID.po

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ msgid "%q in %q must be of type %q, not %q"
125125
msgstr ""
126126

127127
#: ports/espressif/common-hal/espulp/ULP.c
128+
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
128129
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
129130
#: shared-bindings/digitalio/DigitalInOut.c
130131
#: shared-bindings/microcontroller/Pin.c
@@ -403,10 +404,6 @@ msgstr "0.0 ke kompleks berpangkat"
403404
msgid "3-arg pow() not supported"
404405
msgstr "pow() 3-arg tidak didukung"
405406

406-
#: shared-module/msgpack/__init__.c
407-
msgid "64 bit types"
408-
msgstr ""
409-
410407
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
411408
#: ports/atmel-samd/common-hal/countio/Counter.c
412409
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1233,13 +1230,15 @@ msgstr ""
12331230
msgid "Interrupt error."
12341231
msgstr ""
12351232

1233+
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12361234
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
12371235
#: shared-bindings/digitalio/DigitalInOut.c
12381236
#: shared-bindings/displayio/EPaperDisplay.c
12391237
msgid "Invalid %q"
12401238
msgstr ""
12411239

12421240
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
1241+
#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
12431242
#: shared-bindings/microcontroller/Pin.c
12441243
msgid "Invalid %q pin"
12451244
msgstr "%q pada tidak valid"
@@ -1283,6 +1282,10 @@ msgstr ""
12831282
msgid "Invalid data_pins[%d]"
12841283
msgstr ""
12851284

1285+
#: shared-module/msgpack/__init__.c
1286+
msgid "Invalid format"
1287+
msgstr ""
1288+
12861289
#: shared-module/audiocore/WaveFile.c
12871290
msgid "Invalid format chunk size"
12881291
msgstr "Ukuran potongan format tidak valid"
@@ -3856,11 +3859,7 @@ msgstr ""
38563859
msgid "out must be a float dense array"
38573860
msgstr ""
38583861

3859-
#: shared-bindings/displayio/Bitmap.c
3860-
msgid "out of range of source"
3861-
msgstr ""
3862-
3863-
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
3862+
#: shared-bindings/bitmaptools/__init__.c
38643863
msgid "out of range of target"
38653864
msgstr ""
38663865

@@ -3885,14 +3884,10 @@ msgstr ""
38853884
msgid "parameters must be registers in sequence r0 to r3"
38863885
msgstr "parameter harus menjadi register dalam urutan r0 sampai r3"
38873886

3888-
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
3887+
#: shared-bindings/bitmaptools/__init__.c
38893888
msgid "pixel coordinates out of bounds"
38903889
msgstr ""
38913890

3892-
#: shared-bindings/displayio/Bitmap.c
3893-
msgid "pixel value requires too many bits"
3894-
msgstr ""
3895-
38963891
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
38973892
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
38983893
msgstr ""
@@ -4305,10 +4300,6 @@ msgstr ""
43054300
msgid "value out of range of target"
43064301
msgstr ""
43074302

4308-
#: shared-bindings/displayio/Bitmap.c
4309-
msgid "value_count must be > 0"
4310-
msgstr ""
4311-
43124303
#: ports/espressif/common-hal/watchdog/WatchDogTimer.c
43134304
msgid "watchdog not initialized"
43144305
msgstr ""

‎locale/circuitpython.pot

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ msgid "%q in %q must be of type %q, not %q"
122122
msgstr ""
123123

124124
#: ports/espressif/common-hal/espulp/ULP.c
125+
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
125126
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
126127
#: shared-bindings/digitalio/DigitalInOut.c
127128
#: shared-bindings/microcontroller/Pin.c
@@ -400,10 +401,6 @@ msgstr ""
400401
msgid "3-arg pow() not supported"
401402
msgstr ""
402403

403-
#: shared-module/msgpack/__init__.c
404-
msgid "64 bit types"
405-
msgstr ""
406-
407404
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
408405
#: ports/atmel-samd/common-hal/countio/Counter.c
409406
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1221,13 +1218,15 @@ msgstr ""
12211218
msgid "Interrupt error."
12221219
msgstr ""
12231220

1221+
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12241222
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
12251223
#: shared-bindings/digitalio/DigitalInOut.c
12261224
#: shared-bindings/displayio/EPaperDisplay.c
12271225
msgid "Invalid %q"
12281226
msgstr ""
12291227

12301228
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
1229+
#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
12311230
#: shared-bindings/microcontroller/Pin.c
12321231
msgid "Invalid %q pin"
12331232
msgstr ""
@@ -1271,6 +1270,10 @@ msgstr ""
12711270
msgid "Invalid data_pins[%d]"
12721271
msgstr ""
12731272

1273+
#: shared-module/msgpack/__init__.c
1274+
msgid "Invalid format"
1275+
msgstr ""
1276+
12741277
#: shared-module/audiocore/WaveFile.c
12751278
msgid "Invalid format chunk size"
12761279
msgstr ""
@@ -3827,11 +3830,7 @@ msgstr ""
38273830
msgid "out must be a float dense array"
38283831
msgstr ""
38293832

3830-
#: shared-bindings/displayio/Bitmap.c
3831-
msgid "out of range of source"
3832-
msgstr ""
3833-
3834-
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
3833+
#: shared-bindings/bitmaptools/__init__.c
38353834
msgid "out of range of target"
38363835
msgstr ""
38373836

@@ -3856,14 +3855,10 @@ msgstr ""
38563855
msgid "parameters must be registers in sequence r0 to r3"
38573856
msgstr ""
38583857

3859-
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
3858+
#: shared-bindings/bitmaptools/__init__.c
38603859
msgid "pixel coordinates out of bounds"
38613860
msgstr ""
38623861

3863-
#: shared-bindings/displayio/Bitmap.c
3864-
msgid "pixel value requires too many bits"
3865-
msgstr ""
3866-
38673862
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
38683863
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
38693864
msgstr ""
@@ -4276,10 +4271,6 @@ msgstr ""
42764271
msgid "value out of range of target"
42774272
msgstr ""
42784273

4279-
#: shared-bindings/displayio/Bitmap.c
4280-
msgid "value_count must be > 0"
4281-
msgstr ""
4282-
42834274
#: ports/espressif/common-hal/watchdog/WatchDogTimer.c
42844275
msgid "watchdog not initialized"
42854276
msgstr ""

‎locale/cs.po

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ msgid "%q in %q must be of type %q, not %q"
126126
msgstr ""
127127

128128
#: ports/espressif/common-hal/espulp/ULP.c
129+
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
129130
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
130131
#: shared-bindings/digitalio/DigitalInOut.c
131132
#: shared-bindings/microcontroller/Pin.c
@@ -404,10 +405,6 @@ msgstr ""
404405
msgid "3-arg pow() not supported"
405406
msgstr "pow() nepodporuje 3 argumenty"
406407

407-
#: shared-module/msgpack/__init__.c
408-
msgid "64 bit types"
409-
msgstr "64 bit typy"
410-
411408
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
412409
#: ports/atmel-samd/common-hal/countio/Counter.c
413410
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1233,13 +1230,15 @@ msgstr ""
12331230
msgid "Interrupt error."
12341231
msgstr ""
12351232

1233+
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12361234
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
12371235
#: shared-bindings/digitalio/DigitalInOut.c
12381236
#: shared-bindings/displayio/EPaperDisplay.c
12391237
msgid "Invalid %q"
12401238
msgstr ""
12411239

12421240
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
1241+
#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
12431242
#: shared-bindings/microcontroller/Pin.c
12441243
msgid "Invalid %q pin"
12451244
msgstr "Neplatný pin %q"
@@ -1283,6 +1282,10 @@ msgstr ""
12831282
msgid "Invalid data_pins[%d]"
12841283
msgstr "Chybný data_pin[%d]"
12851284

1285+
#: shared-module/msgpack/__init__.c
1286+
msgid "Invalid format"
1287+
msgstr ""
1288+
12861289
#: shared-module/audiocore/WaveFile.c
12871290
msgid "Invalid format chunk size"
12881291
msgstr "Neplatná velikost bloku"
@@ -3842,11 +3845,7 @@ msgstr ""
38423845
msgid "out must be a float dense array"
38433846
msgstr ""
38443847

3845-
#: shared-bindings/displayio/Bitmap.c
3846-
msgid "out of range of source"
3847-
msgstr ""
3848-
3849-
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
3848+
#: shared-bindings/bitmaptools/__init__.c
38503849
msgid "out of range of target"
38513850
msgstr ""
38523851

@@ -3871,14 +3870,10 @@ msgstr ""
38713870
msgid "parameters must be registers in sequence r0 to r3"
38723871
msgstr ""
38733872

3874-
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
3873+
#: shared-bindings/bitmaptools/__init__.c
38753874
msgid "pixel coordinates out of bounds"
38763875
msgstr ""
38773876

3878-
#: shared-bindings/displayio/Bitmap.c
3879-
msgid "pixel value requires too many bits"
3880-
msgstr ""
3881-
38823877
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
38833878
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
38843879
msgstr ""
@@ -4291,10 +4286,6 @@ msgstr ""
42914286
msgid "value out of range of target"
42924287
msgstr ""
42934288

4294-
#: shared-bindings/displayio/Bitmap.c
4295-
msgid "value_count must be > 0"
4296-
msgstr ""
4297-
42984289
#: ports/espressif/common-hal/watchdog/WatchDogTimer.c
42994290
msgid "watchdog not initialized"
43004291
msgstr ""
@@ -4382,6 +4373,9 @@ msgstr ""
43824373
msgid "zi must be of shape (n_section, 2)"
43834374
msgstr ""
43844375

4376+
#~ msgid "64 bit types"
4377+
#~ msgstr "64 bit typy"
4378+
43854379
#~ msgid "No key was specified"
43864380
#~ msgstr "Nebyl zadán klíč"
43874381

0 commit comments

Comments
 (0)