Skip to content

Commit 8094435

Browse files
committed
Merge branch 'main' of https://github.com/adafruit/circuitpython into add-translation-for-builtin-object-help
2 parents 87849fb + c4f0325 commit 8094435

Some content is hidden

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

82 files changed

+3162
-214
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
board:
177177
- "8086_commander"
178178
- "ADM_B_NRF52840_1"
179-
- "TG-Watch02A"
179+
- "TG-Watch"
180180
- "aloriumtech_evo_m51"
181181
- "aramcon_badge_2019"
182182
- "arduino_mkr1300"
@@ -261,6 +261,7 @@ jobs:
261261
- "monster_m4sk"
262262
- "ndgarage_ndbit6"
263263
- "ndgarage_ndbit6_v2"
264+
- "neopixel_trinkey_m0"
264265
- "nfc_copy_cat"
265266
- "nice_nano"
266267
- "nucleo_f746zg"
@@ -431,6 +432,8 @@ jobs:
431432
fail-fast: false
432433
matrix:
433434
board:
435+
- "adafruit_feather_esp32s2_nopsram"
436+
- "adafruit_feather_esp32s2_tftback_nopsram"
434437
- "adafruit_magtag_2.9_grayscale"
435438
- "adafruit_metro_esp32s2"
436439
- "electroniccats_bastwifi"
@@ -461,7 +464,7 @@ jobs:
461464
id: idf-cache
462465
with:
463466
path: ${{ github.workspace }}/.idf_tools
464-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200801
467+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210114
465468
- name: Clone IDF submodules
466469
run: |
467470
(cd $IDF_PATH && git submodule update --init)

.gitmodules

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,18 @@
156156
[submodule "ports/esp32s2/certificates/nina-fw"]
157157
path = ports/esp32s2/certificates/nina-fw
158158
url = https://github.com/adafruit/nina-fw.git
159+
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
160+
path = frozen/Adafruit_CircuitPython_ST7789
161+
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
162+
[submodule "frozen/Adafruit_CircuitPython_Display_Shapes"]
163+
path = frozen/Adafruit_CircuitPython_Display_Shapes
164+
url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Shapes
165+
[submodule "frozen/Adafruit_CircuitPython_Display_Text"]
166+
path = frozen/Adafruit_CircuitPython_Display_Text
167+
url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Text
168+
[submodule "frozen/Adafruit_CircuitPython_ProgressBar"]
169+
path = frozen/Adafruit_CircuitPython_ProgressBar
170+
url = https://github.com/adafruit/Adafruit_CircuitPython_ProgressBar
171+
[submodule "frozen/Adafruit_CircuitPython_LC709203F"]
172+
path = frozen/Adafruit_CircuitPython_LC709203F
173+
url = https://github.com/adafruit/Adafruit_CircuitPython_LC709203F

.pre-commit-config.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,3 @@ repos:
1111
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/esp32s2/esp-idf-config/.*|ports/esp32s2/boards/.*/sdkconfig)'
1212
- id: trailing-whitespace
1313
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
14-
- repo: local
15-
hooks:
16-
- id: translations
17-
name: Check Translations
18-
entry: sh -c "make translate"
19-
language: system
20-
always_run: true

lib/uzlib

Submodule uzlib updated 248 files

locale/ID.po

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ msgstr "%q harus berupa int"
118118
msgid "%q() takes %d positional arguments but %d were given"
119119
msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
120120

121+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
122+
#, c-format
123+
msgid "%s error 0x%x"
124+
msgstr ""
125+
121126
#: py/argcheck.c
122127
msgid "'%q' argument required"
123128
msgstr "'%q' argumen dibutuhkan"
@@ -280,6 +285,10 @@ msgstr "0.0 ke kompleks berpangkat"
280285
msgid "3-arg pow() not supported"
281286
msgstr "pow() 3-arg tidak didukung"
282287

288+
#: shared-module/msgpack/__init__.c
289+
msgid "64 bit types"
290+
msgstr ""
291+
283292
#: ports/atmel-samd/common-hal/countio/Counter.c
284293
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
285294
msgid "A hardware interrupt channel is already in use"
@@ -542,6 +551,10 @@ msgstr "Bytes harus di antara 0 dan 255."
542551
msgid "CBC blocks must be multiples of 16 bytes"
543552
msgstr "Blok CBC harus merupakan kelipatan 16 byte"
544553

554+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
555+
msgid "CRC or checksum was invalid"
556+
msgstr ""
557+
545558
#: py/objtype.c
546559
msgid "Call super().__init__() before accessing native object."
547560
msgstr "Panggil super().__init__() sebelum mengakses objek asli."
@@ -1002,6 +1015,10 @@ msgstr "Frekuensi harus cocok dengan PWMOut yang ada menggunakan timer ini"
10021015
msgid "Function requires lock"
10031016
msgstr "Fungsinya membutuhkan kunci"
10041017

1018+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1019+
msgid "Generic Failure"
1020+
msgstr ""
1021+
10051022
#: shared-bindings/displayio/Display.c
10061023
#: shared-bindings/displayio/EPaperDisplay.c
10071024
#: shared-bindings/framebufferio/FramebufferDisplay.c
@@ -1130,6 +1147,7 @@ msgstr "Frekuensi PWM tidak valid"
11301147
msgid "Invalid Pin"
11311148
msgstr ""
11321149

1150+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
11331151
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
11341152
msgid "Invalid argument"
11351153
msgstr "Argumen tidak valid"
@@ -1239,6 +1257,14 @@ msgstr "Mode operasi tidak valid."
12391257
msgid "Invalid security_mode"
12401258
msgstr "security_mode tidak valid"
12411259

1260+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1261+
msgid "Invalid size"
1262+
msgstr ""
1263+
1264+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1265+
msgid "Invalid state"
1266+
msgstr ""
1267+
12421268
#: shared-bindings/audiomixer/Mixer.c
12431269
msgid "Invalid voice"
12441270
msgstr "Suara tidak valid"
@@ -1279,6 +1305,10 @@ msgstr "Panjang harus berupa int"
12791305
msgid "Length must be non-negative"
12801306
msgstr "Panjangnya harus non-negatif"
12811307

1308+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1309+
msgid "MAC address was invalid"
1310+
msgstr ""
1311+
12821312
#: shared-module/bitbangio/SPI.c
12831313
msgid "MISO pin init failed."
12841314
msgstr "Pin MISO gagal inisialisasi."
@@ -1511,12 +1541,12 @@ msgstr ""
15111541
"Hanya monokrom, 4bpp atau 8bpp yang diindeks, dan 16bpp atau lebih yang "
15121542
"didukung: %d bpp diberikan"
15131543

1514-
#: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
1515-
msgid "Only one alarm.time alarm can be set."
1544+
#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
1545+
msgid "Only one TouchAlarm can be set in deep sleep."
15161546
msgstr ""
15171547

1518-
#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
1519-
msgid "Only one alarm.touch alarm can be set."
1548+
#: ports/esp32s2/common-hal/alarm/time/TimeAlarm.c
1549+
msgid "Only one alarm.time alarm can be set."
15201550
msgstr ""
15211551

15221552
#: shared-module/displayio/ColorConverter.c
@@ -1527,6 +1557,18 @@ msgstr ""
15271557
msgid "Only raw int supported for ip"
15281558
msgstr ""
15291559

1560+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1561+
msgid "Operation or feature not supported"
1562+
msgstr ""
1563+
1564+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1565+
msgid "Operation timed out"
1566+
msgstr ""
1567+
1568+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1569+
msgid "Out of memory"
1570+
msgstr ""
1571+
15301572
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
15311573
msgid "Out of sockets"
15321574
msgstr ""
@@ -1535,6 +1577,10 @@ msgstr ""
15351577
msgid "Oversample must be multiple of 8."
15361578
msgstr "Sampel berlebihan harus kelipatan 8."
15371579

1580+
#: shared-bindings/audiobusio/PDMIn.c
1581+
msgid "PDMIn not available"
1582+
msgstr ""
1583+
15381584
#: shared-bindings/pwmio/PWMOut.c
15391585
msgid ""
15401586
"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)"
@@ -1553,6 +1599,10 @@ msgstr ""
15531599
msgid "ParallelBus not yet supported"
15541600
msgstr "ParallelBus belum didukung"
15551601

1602+
#: ports/esp32s2/common-hal/audiobusio/__init__.c
1603+
msgid "Peripheral in use"
1604+
msgstr ""
1605+
15561606
#: py/moduerrno.c
15571607
msgid "Permission denied"
15581608
msgstr "Izin ditolak"
@@ -1674,6 +1724,10 @@ msgstr "sistem file (filesystem) bersifat Read-only"
16741724
msgid "Read-only object"
16751725
msgstr "sistem file (filesystem) bersifat Read-only"
16761726

1727+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1728+
msgid "Received response was invalid"
1729+
msgstr ""
1730+
16771731
#: shared-bindings/displayio/EPaperDisplay.c
16781732
msgid "Refresh too soon"
16791733
msgstr "Segarkan terlalu cepat"
@@ -1686,6 +1740,10 @@ msgstr ""
16861740
msgid "Requested AES mode is unsupported"
16871741
msgstr "Mode AES yang diminta tidak didukung"
16881742

1743+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
1744+
msgid "Requested resource not found"
1745+
msgstr ""
1746+
16891747
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
16901748
msgid "Right channel unsupported"
16911749
msgstr "Channel Kanan tidak didukung"
@@ -2065,6 +2123,10 @@ msgstr ""
20652123
msgid "Value length > max_length"
20662124
msgstr ""
20672125

2126+
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
2127+
msgid "Version was invalid"
2128+
msgstr ""
2129+
20682130
#: py/emitnative.c
20692131
msgid "Viper functions don't currently support more than 4 arguments"
20702132
msgstr ""
@@ -2474,6 +2536,10 @@ msgstr ""
24742536
msgid "circle can only be registered in one parent"
24752537
msgstr ""
24762538

2539+
#: shared-bindings/msgpack/ExtType.c
2540+
msgid "code outside range 0~127"
2541+
msgstr ""
2542+
24772543
#: shared-bindings/displayio/Palette.c
24782544
msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
24792545
msgstr ""
@@ -2558,6 +2624,10 @@ msgstr ""
25582624
msgid "default 'except' must be last"
25592625
msgstr "'except' standar harus terakhir"
25602626

2627+
#: shared-bindings/msgpack/__init__.c
2628+
msgid "default is not a function"
2629+
msgstr ""
2630+
25612631
#: shared-bindings/audiobusio/PDMIn.c
25622632
msgid ""
25632633
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2657,6 +2727,10 @@ msgstr "hanya mengharapkan sebuah nilai (value) untuk set"
26572727
msgid "expecting key:value for dict"
26582728
msgstr "key:value diharapkan untuk dict"
26592729

2730+
#: shared-bindings/msgpack/__init__.c
2731+
msgid "ext_hook is not a function"
2732+
msgstr ""
2733+
26602734
#: py/argcheck.c
26612735
msgid "extra keyword arguments given"
26622736
msgstr "argumen keyword ekstra telah diberikan"
@@ -3189,6 +3263,10 @@ msgstr ""
31893263
msgid "no binding for nonlocal found"
31903264
msgstr "tidak ada ikatan/bind pada temuan nonlocal"
31913265

3266+
#: shared-module/msgpack/__init__.c
3267+
msgid "no default packer"
3268+
msgstr ""
3269+
31923270
#: py/builtinimport.c
31933271
msgid "no module named '%q'"
31943272
msgstr "tidak ada modul yang bernama '%q'"
@@ -3427,6 +3505,8 @@ msgstr ""
34273505
msgid "pow() with 3 arguments requires integers"
34283506
msgstr ""
34293507

3508+
#: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h
3509+
#: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
34303510
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
34313511
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
34323512
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
@@ -3523,6 +3603,10 @@ msgstr "kompilasi script tidak didukung"
35233603
msgid "shape must be a tuple"
35243604
msgstr ""
35253605

3606+
#: shared-module/msgpack/__init__.c
3607+
msgid "short read"
3608+
msgstr ""
3609+
35263610
#: py/objstr.c
35273611
msgid "sign not allowed in string format specifier"
35283612
msgstr ""
@@ -3896,6 +3980,10 @@ msgstr ""
38963980
msgid "x value out of bounds"
38973981
msgstr ""
38983982

3983+
#: ports/esp32s2/common-hal/audiobusio/__init__.c
3984+
msgid "xTaskCreate failed"
3985+
msgstr ""
3986+
38993987
#: shared-bindings/displayio/Shape.c
39003988
msgid "y should be an int"
39013989
msgstr ""

0 commit comments

Comments
 (0)