Skip to content

Commit bc26194

Browse files
mahollimaholli
authored
Merge branch 'adafruit:main' into pycubed_v05c
2 parents fa83c1c + 1b5afc0 commit bc26194

File tree

33 files changed

+557
-464
lines changed

33 files changed

+557
-464
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ jobs:
228228
fail-fast: false
229229
matrix:
230230
board: ${{ fromJSON(needs.test.outputs.arm-boards) }}
231+
if: ${{ needs.test.outputs.arm-boards != '[]' }}
231232

232233
steps:
233234
- name: Set up Python 3.8
@@ -278,6 +279,7 @@ jobs:
278279
fail-fast: false
279280
matrix:
280281
board: ${{ fromJSON(needs.test.outputs.riscv-boards) }}
282+
if: ${{ needs.test.outputs.riscv-boards != '[]' }}
281283

282284
steps:
283285
- name: Set up Python 3.8
@@ -327,6 +329,7 @@ jobs:
327329
fail-fast: false
328330
matrix:
329331
board: ${{ fromJSON(needs.test.outputs.xtensa-boards) }}
332+
if: ${{ needs.test.outputs.xtensa-boards != '[]' }}
330333

331334
steps:
332335
- name: Set up Python 3.8

‎BUILDING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ This project has a bunch of git submodules. You will need to update them regula
2828
git submodule sync
2929
git submodule update --init
3030

31+
### Required Python Packages
32+
33+
Failing to install these will prevent from properly building.
34+
35+
pip3 install -r requirements-dev.txt
36+
3137
### mpy-cross
3238

3339
As part of the build process, mpy-cross is needed to compile .py files into .mpy files.

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Behavior
119119
them. CircuitPython's goal is to clarify the role of each file and
120120
make each file independent from each other.
121121

122-
- ``boot.py`` (or ``settings.py``) runs only once on start up before
122+
- ``boot.py`` runs only once on start up before
123123
USB is initialized. This lays the ground work for configuring USB at
124124
startup rather than it being fixed. Since serial is not available,
125125
output is written to ``boot_out.txt``.

‎locale/ID.po

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

45-
#: lib/utils/pyexec.c
46-
msgid ""
47-
"\n"
48-
"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n"
49-
"=== "
50-
msgstr ""
51-
5245
#: py/obj.c
5346
msgid " File \"%q\""
5447
msgstr " File \"%q\""
@@ -407,6 +400,9 @@ msgstr "Semua perangkat SPI sedang digunakan"
407400
msgid "All UART peripherals are in use"
408401
msgstr "Semua perangkat UART sedang digunakan"
409402

403+
#: ports/nrf/common-hal/countio/Counter.c
404+
#: ports/nrf/common-hal/pulseio/PulseIn.c
405+
#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c
410406
#: shared-bindings/pwmio/PWMOut.c
411407
msgid "All channels in use"
412408
msgstr ""
@@ -632,10 +628,10 @@ msgstr "Penyangga harus memiliki panjang setidaknya 1"
632628
msgid "Buffer too short by %d bytes"
633629
msgstr "Buffer terlalu pendek untuk %d byte"
634630

635-
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
636-
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
637-
#: ports/nrf/common-hal/displayio/ParallelBus.c
638-
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
631+
#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
632+
#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c
633+
#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
634+
#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c
639635
#, c-format
640636
msgid "Bus pin %d is already in use"
641637
msgstr "Pin bus %d sudah digunakan"
@@ -803,7 +799,7 @@ msgid "Column entry must be digitalio.DigitalInOut"
803799
msgstr "Entri kolom harus digitalio.DigitalInOut"
804800

805801
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
806-
#: shared-bindings/displayio/ParallelBus.c
802+
#: shared-bindings/paralleldisplay/ParallelBus.c
807803
msgid "Command must be an int between 0 and 255"
808804
msgstr "Perintah harus berupa int di antara 0 dan 255"
809805

@@ -897,12 +893,12 @@ msgstr "Terjadi kesalahan saat menginisialisasi perangkat DAC"
897893
msgid "DAC already in use"
898894
msgstr "DAC sudah digunakan"
899895

900-
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
901-
#: ports/nrf/common-hal/displayio/ParallelBus.c
896+
#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
897+
#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
902898
msgid "Data 0 pin must be byte aligned"
903899
msgstr "Data 0 pin harus byte disejajarkan"
904900

905-
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
901+
#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c
906902
msgid "Data 0 pin must be byte aligned."
907903
msgstr ""
908904

@@ -1855,11 +1851,6 @@ msgstr ""
18551851
msgid "PWM slice channel A already in use"
18561852
msgstr ""
18571853

1858-
#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c
1859-
#: ports/stm/common-hal/displayio/ParallelBus.c
1860-
msgid "ParallelBus not yet supported"
1861-
msgstr "ParallelBus belum didukung"
1862-
18631854
#: ports/esp32s2/common-hal/audiobusio/__init__.c
18641855
msgid "Peripheral in use"
18651856
msgstr "Periferal sedang digunakan"
@@ -3697,7 +3688,7 @@ msgid "no module named '%q'"
36973688
msgstr "tidak ada modul yang bernama '%q'"
36983689

36993690
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
3700-
#: shared-bindings/displayio/ParallelBus.c
3691+
#: shared-bindings/paralleldisplay/ParallelBus.c
37013692
msgid "no reset pin available"
37023693
msgstr ""
37033694

@@ -3971,6 +3962,7 @@ msgstr ""
39713962
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
39723963
#: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h
39733964
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3965+
#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h
39743966
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
39753967
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
39763968
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -3991,6 +3983,7 @@ msgstr ""
39913983
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
39923984
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
39933985
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
3986+
#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
39943987
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
39953988
#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h
39963989
msgid "pressing boot button at start up.\n"
@@ -4024,10 +4017,6 @@ msgstr ""
40244017
msgid "queue overflow"
40254018
msgstr "antrian meluap (overflow)"
40264019

4027-
#: lib/utils/pyexec.c
4028-
msgid "raw REPL; CTRL-B to exit\n"
4029-
msgstr ""
4030-
40314020
#: py/parse.c
40324021
msgid "raw f-strings are not implemented"
40334022
msgstr ""
@@ -4520,6 +4509,9 @@ msgstr "zi harus berjenis float"
45204509
msgid "zi must be of shape (n_section, 2)"
45214510
msgstr ""
45224511

4512+
#~ msgid "ParallelBus not yet supported"
4513+
#~ msgstr "ParallelBus belum didukung"
4514+
45234515
#~ msgid "Buffer too large and unable to allocate"
45244516
#~ msgstr "Buffer terlalu besar dan tidak dapat dialokasikan"
45254517

‎locale/cs.po

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ 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-
#: lib/utils/pyexec.c
42-
msgid ""
43-
"\n"
44-
"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n"
45-
"=== "
46-
msgstr ""
47-
4841
#: py/obj.c
4942
msgid " File \"%q\""
5043
msgstr " Soubor \"%q\""
@@ -403,6 +396,9 @@ msgstr ""
403396
msgid "All UART peripherals are in use"
404397
msgstr ""
405398

399+
#: ports/nrf/common-hal/countio/Counter.c
400+
#: ports/nrf/common-hal/pulseio/PulseIn.c
401+
#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c
406402
#: shared-bindings/pwmio/PWMOut.c
407403
msgid "All channels in use"
408404
msgstr ""
@@ -626,10 +622,10 @@ msgstr ""
626622
msgid "Buffer too short by %d bytes"
627623
msgstr ""
628624

629-
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
630-
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
631-
#: ports/nrf/common-hal/displayio/ParallelBus.c
632-
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
625+
#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
626+
#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c
627+
#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
628+
#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c
633629
#, c-format
634630
msgid "Bus pin %d is already in use"
635631
msgstr ""
@@ -789,7 +785,7 @@ msgid "Column entry must be digitalio.DigitalInOut"
789785
msgstr ""
790786

791787
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
792-
#: shared-bindings/displayio/ParallelBus.c
788+
#: shared-bindings/paralleldisplay/ParallelBus.c
793789
msgid "Command must be an int between 0 and 255"
794790
msgstr ""
795791

@@ -882,12 +878,12 @@ msgstr ""
882878
msgid "DAC already in use"
883879
msgstr ""
884880

885-
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
886-
#: ports/nrf/common-hal/displayio/ParallelBus.c
881+
#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
882+
#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
887883
msgid "Data 0 pin must be byte aligned"
888884
msgstr ""
889885

890-
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
886+
#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c
891887
msgid "Data 0 pin must be byte aligned."
892888
msgstr ""
893889

@@ -1831,11 +1827,6 @@ msgstr ""
18311827
msgid "PWM slice channel A already in use"
18321828
msgstr ""
18331829

1834-
#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c
1835-
#: ports/stm/common-hal/displayio/ParallelBus.c
1836-
msgid "ParallelBus not yet supported"
1837-
msgstr ""
1838-
18391830
#: ports/esp32s2/common-hal/audiobusio/__init__.c
18401831
msgid "Peripheral in use"
18411832
msgstr ""
@@ -3658,7 +3649,7 @@ msgid "no module named '%q'"
36583649
msgstr ""
36593650

36603651
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
3661-
#: shared-bindings/displayio/ParallelBus.c
3652+
#: shared-bindings/paralleldisplay/ParallelBus.c
36623653
msgid "no reset pin available"
36633654
msgstr ""
36643655

@@ -3931,6 +3922,7 @@ msgstr ""
39313922
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
39323923
#: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h
39333924
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3925+
#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h
39343926
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
39353927
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
39363928
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -3951,6 +3943,7 @@ msgstr ""
39513943
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
39523944
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
39533945
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
3946+
#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
39543947
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
39553948
#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h
39563949
msgid "pressing boot button at start up.\n"
@@ -3984,10 +3977,6 @@ msgstr ""
39843977
msgid "queue overflow"
39853978
msgstr ""
39863979

3987-
#: lib/utils/pyexec.c
3988-
msgid "raw REPL; CTRL-B to exit\n"
3989-
msgstr ""
3990-
39913980
#: py/parse.c
39923981
msgid "raw f-strings are not implemented"
39933982
msgstr ""

0 commit comments

Comments
 (0)