diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2971032018..5c743bdb91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,6 +228,7 @@ jobs: fail-fast: false matrix: board: ${{ fromJSON(needs.test.outputs.arm-boards) }} + if: ${{ needs.test.outputs.arm-boards != '[]' }} steps: - name: Set up Python 3.8 @@ -278,6 +279,7 @@ jobs: fail-fast: false matrix: board: ${{ fromJSON(needs.test.outputs.riscv-boards) }} + if: ${{ needs.test.outputs.riscv-boards != '[]' }} steps: - name: Set up Python 3.8 @@ -327,6 +329,7 @@ jobs: fail-fast: false matrix: board: ${{ fromJSON(needs.test.outputs.xtensa-boards) }} + if: ${{ needs.test.outputs.xtensa-boards != '[]' }} steps: - name: Set up Python 3.8 diff --git a/BUILDING.md b/BUILDING.md index 256996807d..0686df3c04 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -28,6 +28,12 @@ This project has a bunch of git submodules. You will need to update them regula git submodule sync git submodule update --init +### Required Python Packages + +Failing to install these will prevent from properly building. + + pip3 install -r requirements-dev.txt + ### mpy-cross As part of the build process, mpy-cross is needed to compile .py files into .mpy files. diff --git a/README.rst b/README.rst index 69acb8550b..b594174d5b 100644 --- a/README.rst +++ b/README.rst @@ -119,7 +119,7 @@ Behavior them. CircuitPython's goal is to clarify the role of each file and make each file independent from each other. - - ``boot.py`` (or ``settings.py``) runs only once on start up before + - ``boot.py`` runs only once on start up before USB is initialized. This lays the ground work for configuring USB at startup rather than it being fixed. Since serial is not available, output is written to ``boot_out.txt``. diff --git a/locale/ID.po b/locale/ID.po index 8c2f5db74d..ba0fe50025 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -42,13 +42,6 @@ msgstr "" "Harap ajukan masalah dengan konten drive CIRCUITPY Anda di\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " File \"%q\"" @@ -407,6 +400,9 @@ msgstr "Semua perangkat SPI sedang digunakan" msgid "All UART peripherals are in use" msgstr "Semua perangkat UART sedang digunakan" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -632,10 +628,10 @@ msgstr "Penyangga harus memiliki panjang setidaknya 1" msgid "Buffer too short by %d bytes" msgstr "Buffer terlalu pendek untuk %d byte" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Pin bus %d sudah digunakan" @@ -803,7 +799,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Entri kolom harus digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Perintah harus berupa int di antara 0 dan 255" @@ -897,12 +893,12 @@ msgstr "Terjadi kesalahan saat menginisialisasi perangkat DAC" msgid "DAC already in use" msgstr "DAC sudah digunakan" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin harus byte disejajarkan" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1855,11 +1851,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus belum didukung" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "Periferal sedang digunakan" @@ -3697,7 +3688,7 @@ msgid "no module named '%q'" msgstr "tidak ada modul yang bernama '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3971,6 +3962,7 @@ msgstr "" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3991,6 +3983,7 @@ msgstr "" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4024,10 +4017,6 @@ msgstr "" msgid "queue overflow" msgstr "antrian meluap (overflow)" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" @@ -4520,6 +4509,9 @@ msgstr "zi harus berjenis float" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus belum didukung" + #~ msgid "Buffer too large and unable to allocate" #~ msgstr "Buffer terlalu besar dan tidak dapat dialokasikan" diff --git a/locale/cs.po b/locale/cs.po index b79e56617e..882e53be4f 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -38,13 +38,6 @@ msgstr "" "Založte prosím problém s obsahem vaší jednotky CIRCUITPY na adrese\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " Soubor \"%q\"" @@ -403,6 +396,9 @@ msgstr "" msgid "All UART peripherals are in use" msgstr "" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -626,10 +622,10 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "" @@ -789,7 +785,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "" @@ -882,12 +878,12 @@ msgstr "" msgid "DAC already in use" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1831,11 +1827,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3658,7 +3649,7 @@ msgid "no module named '%q'" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3931,6 +3922,7 @@ msgstr "" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3951,6 +3943,7 @@ msgstr "" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -3984,10 +3977,6 @@ msgstr "" msgid "queue overflow" msgstr "" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index eda73776ba..5424154193 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -41,13 +41,6 @@ msgstr "" "Bitte melden Sie ein Problem mit dem Inhalt Ihres CIRCUITPY-Laufwerks unter\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " Datei \"%q\"" @@ -409,6 +402,9 @@ msgstr "Alle SPI-Peripheriegeräte sind in Benutzung" msgid "All UART peripherals are in use" msgstr "Alle UART-Peripheriegeräte sind in Benutzung" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -634,10 +630,10 @@ msgstr "Der Puffer muss eine Mindestenslänge von 1 haben" msgid "Buffer too short by %d bytes" msgstr "Puffer um %d Bytes zu kurz" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d wird schon benutzt" @@ -799,7 +795,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Spalteneintrag muss digitalio.DigitalInOut sein" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Der Befehl muss ein int zwischen 0 und 255 sein" @@ -894,12 +890,12 @@ msgstr "DAC Device Initialisierungs-Fehler" msgid "DAC already in use" msgstr "DAC wird schon benutzt" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin muss am Byte ausgerichtet sein" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "Data 0 Pin muss Byte aligned sein." @@ -1855,11 +1851,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus wird noch nicht unterstützt" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3723,7 +3714,7 @@ msgid "no module named '%q'" msgstr "Kein Modul mit dem Namen '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "kein Reset Pin verfügbar" @@ -4000,6 +3991,7 @@ msgstr "pow() mit 3 Argumenten erfordert Integer" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4020,6 +4012,7 @@ msgstr "pow() mit 3 Argumenten erfordert Integer" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4053,10 +4046,6 @@ msgstr "" msgid "queue overflow" msgstr "Warteschlangenüberlauf" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "rohe F-Strings sind nicht implementiert" @@ -4556,6 +4545,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus wird noch nicht unterstützt" + #~ msgid "%q must be 0-255" #~ msgstr "%q muss 0-255 sein" diff --git a/locale/el.po b/locale/el.po index b1c936bf8e..e876298ac3 100644 --- a/locale/el.po +++ b/locale/el.po @@ -35,13 +35,6 @@ msgid "" "https://github.com/adafruit/circuitpython/issues\n" msgstr "" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr "" @@ -400,6 +393,9 @@ msgstr "" msgid "All UART peripherals are in use" msgstr "" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -623,10 +619,10 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "" @@ -786,7 +782,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "" @@ -879,12 +875,12 @@ msgstr "" msgid "DAC already in use" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1828,11 +1824,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3655,7 +3646,7 @@ msgid "no module named '%q'" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3928,6 +3919,7 @@ msgstr "" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3948,6 +3940,7 @@ msgstr "" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -3981,10 +3974,6 @@ msgstr "" msgid "queue overflow" msgstr "" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 3f0adcbc07..13f93ab640 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -43,17 +43,6 @@ msgstr "" "Please file an issue with the contents of your CIRCUITPY drive at \n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -#, fuzzy -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " - #: py/obj.c msgid " File \"%q\"" msgstr " File \"%q\"" @@ -272,22 +261,22 @@ msgid "'%s' expects {r0, r1, ...}" msgstr "'%s' expects {r0, r1, ...}" #: py/emitinlinextensa.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "'%s' integer %d isn't within range %d..%d" msgstr "'%s' integer %d isn't within range %d..%d" #: py/emitinlinethumb.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "'%s' integer 0x%x doesn't fit in mask 0x%x" msgstr "'%s' integer 0x%x doesn't fit in mask 0x%x" #: py/obj.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "'%s' object doesn't support item assignment" msgstr "'%s' object doesn't support item assignment" #: py/obj.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "'%s' object doesn't support item deletion" msgstr "'%s' object doesn't support item deletion" @@ -297,7 +286,7 @@ msgid "'%s' object has no attribute '%q'" msgstr "'%s' object has no attribute '%q'" #: py/obj.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "'%s' object isn't subscriptable" msgstr "'%s' object isn't subscriptable" @@ -429,6 +418,9 @@ msgstr "All SPI peripherals are in use" msgid "All UART peripherals are in use" msgstr "All UART peripherals are in use" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "All channels in use" @@ -658,10 +650,10 @@ msgstr "Buffer must be at least length 1" msgid "Buffer too short by %d bytes" msgstr "Buffer too short by %d bytes" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d is already in use" @@ -823,7 +815,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Column entry must be digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Command must be an int between 0 and 255" @@ -918,12 +910,12 @@ msgstr "DAC device init error" msgid "DAC already in use" msgstr "DAC already in use" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin must be byte aligned" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "Data 0 pin must be byte aligned." @@ -988,7 +980,7 @@ msgid "EXTINT channel already in use" msgstr "EXTINT channel already in use" #: shared-module/synthio/MidiTrack.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "Error in MIDI stream at position %d" msgstr "Error in MIDI stream at position %d" @@ -1381,12 +1373,12 @@ msgid "Invalid channel count" msgstr "Invalid channel count" #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "Invalid data_count %d" msgstr "Invalid data_count %d" #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "Invalid data_pins[%d]" msgstr "Invalid data_pins[%d]" @@ -1575,12 +1567,12 @@ msgid "Missing first_set_pin. Instruction %d sets pin(s)" msgstr "Missing first_set_pin. Instruction %d sets pin(s)" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "Missing jmp_pin. Instruction %d jumps on pin" msgstr "Missing jmp_pin. Instruction %d jumps on pin" #: shared-module/usb_hid/Device.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "More than %d report ids not supported" msgstr "More than %d report ids not supported" @@ -1705,7 +1697,7 @@ msgid "No long integer support" msgstr "No long integer support" #: shared-module/usb_hid/__init__.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "No more than %d HID devices allowed" msgstr "No more than %d HID devices allowed" @@ -1889,11 +1881,6 @@ msgstr "PWM slice already in use" msgid "PWM slice channel A already in use" msgstr "PWM slice channel A already in use" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus not yet supported" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "Peripheral in use" @@ -2447,7 +2434,7 @@ msgid "Unknown security error: 0x%04x" msgstr "Unknown security error: 0x%04x" #: ports/nrf/common-hal/_bleio/__init__.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "Unknown system firmware error: %04x" msgstr "Unknown system firmware error: %04x" @@ -2813,7 +2800,7 @@ msgid "can't convert %q to int" msgstr "can't convert %q to int" #: py/obj.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "can't convert %s to complex" msgstr "can't convert %s to complex" @@ -3047,7 +3034,7 @@ msgid "data must be of equal length" msgstr "cata must be of equal length" #: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "data pin #%d in use" msgstr "data pin #%d in use" @@ -3783,7 +3770,7 @@ msgid "no module named '%q'" msgstr "no module named '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "no reset pin available" @@ -3849,7 +3836,7 @@ msgid "object " msgstr "object " #: py/obj.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "object '%s' isn't a tuple or list" msgstr "object '%s' isn't a tuple or list" @@ -3889,7 +3876,7 @@ msgid "object not iterable" msgstr "object not iterable" #: py/obj.c -#, c-format, fuzzy +#, fuzzy, c-format msgid "object of type '%s' has no len()" msgstr "object of type '%s' has no len()" @@ -4065,6 +4052,7 @@ msgstr "pow() with 3 arguments requires integers" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4085,6 +4073,7 @@ msgstr "pow() with 3 arguments requires integers" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4119,11 +4108,6 @@ msgstr "push_threshold must be between 1 and 32" msgid "queue overflow" msgstr "queue overflow" -#: lib/utils/pyexec.c -#, fuzzy -msgid "raw REPL; CTRL-B to exit\n" -msgstr "raw REPL; CTRL-B to exit\n" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "raw f-strings are not implemented" @@ -4626,6 +4610,23 @@ msgstr "zi must be of float type" msgid "zi must be of shape (n_section, 2)" msgstr "zi must be of shape (n_section, 2)" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" +#~ "=== " +#~ msgstr "" +#~ "\n" +#~ "paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" +#~ "=== " + +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus not yet supported" + +#, fuzzy +#~ msgid "raw REPL; CTRL-B to exit\n" +#~ msgstr "raw REPL; CTRL-B to exit\n" + #~ msgid "no available NIC" #~ msgstr "no available NIC" diff --git a/locale/es.po b/locale/es.po index eb744a34fb..8907967d4b 100644 --- a/locale/es.po +++ b/locale/es.po @@ -44,13 +44,6 @@ msgstr "" "Presente un problema con el contenido de su unidad CIRCUITPY en\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " Archivo \"%q\"" @@ -411,6 +404,9 @@ msgstr "Todos los periféricos SPI están siendo usados" msgid "All UART peripherals are in use" msgstr "Todos los periféricos UART están siendo usados" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "Todos los canales esta en uso" @@ -639,10 +635,10 @@ msgstr "Buffer debe ser de longitud 1 como minimo" msgid "Buffer too short by %d bytes" msgstr "Búffer muy corto por %d bytes" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d ya está siendo utilizado" @@ -806,7 +802,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Entrada de columna debe ser digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Command debe ser un int entre 0 y 255" @@ -901,12 +897,12 @@ msgstr "Error de inicio del dispositivo DAC" msgid "DAC already in use" msgstr "DAC ya está siendo utilizado" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "El pin Data 0 debe estar alineado a bytes" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "El pin de datos 0 debe ser alineado a byte." @@ -1873,11 +1869,6 @@ msgstr "Segmento PWM ya esta en uso" msgid "PWM slice channel A already in use" msgstr "Segmento del PWM canal A ya esta en uso" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus todavía no soportado" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "Periférico en uso" @@ -3741,7 +3732,7 @@ msgid "no module named '%q'" msgstr "ningún módulo se llama '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "no hay pin de reinicio disponible" @@ -4017,6 +4008,7 @@ msgstr "pow() con 3 argumentos requiere enteros" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4037,6 +4029,7 @@ msgstr "pow() con 3 argumentos requiere enteros" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4070,10 +4063,6 @@ msgstr "push_threshold debe esta entre 1 y 32" msgid "queue overflow" msgstr "desbordamiento de cola(queue)" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "no está implementado cadenas-f sin procesar" @@ -4569,6 +4558,9 @@ msgstr "zi debe ser de tipo flotante" msgid "zi must be of shape (n_section, 2)" msgstr "zi debe ser una forma (n_section,2)" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus todavía no soportado" + #~ msgid "%q length must be %q" #~ msgstr "el tamaño de %q debe ser %q" diff --git a/locale/fil.po b/locale/fil.po index 0a8352ac27..2e94810632 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -36,13 +36,6 @@ msgid "" "https://github.com/adafruit/circuitpython/issues\n" msgstr "" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " File \"%q\"" @@ -405,6 +398,9 @@ msgstr "Lahat ng SPI peripherals ay ginagamit" msgid "All UART peripherals are in use" msgstr "Lahat ng I2C peripherals ginagamit" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -630,10 +626,10 @@ msgstr "Buffer dapat ay hindi baba sa 1 na haba" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, fuzzy, c-format msgid "Bus pin %d is already in use" msgstr "Ginagamit na ang DAC" @@ -795,7 +791,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c #, fuzzy msgid "Command must be an int between 0 and 255" msgstr "Sa gitna ng 0 o 255 dapat ang bytes." @@ -889,13 +885,13 @@ msgstr "" msgid "DAC already in use" msgstr "Ginagamit na ang DAC" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c #, fuzzy msgid "Data 0 pin must be byte aligned" msgstr "graphic ay dapat 2048 bytes ang haba" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1849,11 +1845,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3702,7 +3693,7 @@ msgid "no module named '%q'" msgstr "walang module na '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3977,6 +3968,7 @@ msgstr "pow() na may 3 argumento kailangan ng integers" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3997,6 +3989,7 @@ msgstr "pow() na may 3 argumento kailangan ng integers" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4030,10 +4023,6 @@ msgstr "" msgid "queue overflow" msgstr "puno na ang pila (overflow)" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index a7f950cfef..2aab5490ca 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -44,13 +44,6 @@ msgstr "" "l'adresse\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " Fichier \"%q\"" @@ -411,6 +404,9 @@ msgstr "Tous les périphériques SPI sont utilisés" msgid "All UART peripherals are in use" msgstr "Tous les périphériques UART sont utilisés" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "Tout les canaux sont utilisés" @@ -640,10 +636,10 @@ msgstr "Le tampon doit être de longueur au moins 1" msgid "Buffer too short by %d bytes" msgstr "Tampon trop court de %d octets" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "La broche %d du bus est déjà utilisée" @@ -812,7 +808,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "L'entrée 'Column' doit être un digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "La commande doit être un chiffre entier entre 0 et 255" @@ -907,12 +903,12 @@ msgstr "Erreur d'initialisation du périphérique DAC" msgid "DAC already in use" msgstr "DAC déjà utilisé" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "La broche 'Data 0' doit être aligné sur l'octet" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "La broche Data 0 doit être aligné sur l'octet." @@ -1883,11 +1879,6 @@ msgstr "PWM slice déja utilisée" msgid "PWM slice channel A already in use" msgstr "Canal A de PWM slice est utilisé" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus pas encore supporté" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "Périphérique en utilisation" @@ -3750,7 +3741,7 @@ msgid "no module named '%q'" msgstr "pas de module '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "pas de broche de réinitialisation disponible" @@ -4028,6 +4019,7 @@ msgstr "pow() avec 3 arguments nécessite des entiers" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4048,6 +4040,7 @@ msgstr "pow() avec 3 arguments nécessite des entiers" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4081,10 +4074,6 @@ msgstr "push_threshold doit être entre 1 et 32" msgid "queue overflow" msgstr "dépassement de file" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "les chaînes f brutes ne sont pas implémentées" @@ -4580,6 +4569,9 @@ msgstr "zi doit être de type float" msgid "zi must be of shape (n_section, 2)" msgstr "zi doit être de forme (n_section, 2)" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus pas encore supporté" + #~ msgid "%q length must be %q" #~ msgstr "La longueur de %q doit être de %q" diff --git a/locale/hi.po b/locale/hi.po index 2d652a7922..18d13e1d7c 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -35,13 +35,6 @@ msgid "" "https://github.com/adafruit/circuitpython/issues\n" msgstr "" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr "" @@ -400,6 +393,9 @@ msgstr "" msgid "All UART peripherals are in use" msgstr "" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -623,10 +619,10 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "" @@ -786,7 +782,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "" @@ -879,12 +875,12 @@ msgstr "" msgid "DAC already in use" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1828,11 +1824,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3655,7 +3646,7 @@ msgid "no module named '%q'" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3928,6 +3919,7 @@ msgstr "" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3948,6 +3940,7 @@ msgstr "" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -3981,10 +3974,6 @@ msgstr "" msgid "queue overflow" msgstr "" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 1ce312db86..db2f1938e5 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -43,13 +43,6 @@ msgstr "" "Per favore, segnala il problema con il contenuto del tuo CIRCUITPY a\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " File \"%q\"" @@ -412,6 +405,9 @@ msgstr "Tutte le periferiche SPI sono in uso" msgid "All UART peripherals are in use" msgstr "Tutte le periferiche I2C sono in uso" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -638,10 +634,10 @@ msgstr "Il buffer deve essere lungo almeno 1" msgid "Buffer too short by %d bytes" msgstr "Buffer troppo piccolo di %d bytes" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d è già in uso" @@ -803,7 +799,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c #, fuzzy msgid "Command must be an int between 0 and 255" msgstr "I byte devono essere compresi tra 0 e 255" @@ -897,13 +893,13 @@ msgstr "" msgid "DAC already in use" msgstr "DAC già in uso" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c #, fuzzy msgid "Data 0 pin must be byte aligned" msgstr "graphic deve essere lunga 2048 byte" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1865,11 +1861,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3714,7 +3705,7 @@ msgid "no module named '%q'" msgstr "nessun modulo chiamato '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3993,6 +3984,7 @@ msgstr "pow() con 3 argomenti richiede interi" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4013,6 +4005,7 @@ msgstr "pow() con 3 argomenti richiede interi" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4046,10 +4039,6 @@ msgstr "" msgid "queue overflow" msgstr "overflow della coda" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index cce70415e8..8e16828164 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -40,13 +40,6 @@ msgstr "" "CIRCUITPYドライブの内容を添えて問題を以下で報告してください：\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " ファイル \"%q\"" @@ -405,6 +398,9 @@ msgstr "全てのSPI周辺機器が使用中" msgid "All UART peripherals are in use" msgstr "全てのUART周辺機器が使用中" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -630,10 +626,10 @@ msgstr "バッファ長は少なくとも1以上でなければなりません" msgid "Buffer too short by %d bytes" msgstr "バッファが %d バイト足りません" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Busピン%dはすでに使用中" @@ -795,7 +791,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Columnの要素は digitalio.DigitalInOut でなければなりません" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "commandは0から255の間の整数でなければなりません" @@ -888,12 +884,12 @@ msgstr "DACデバイス初期化エラー" msgid "DAC already in use" msgstr "DACはすでに使用中" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 ピンは、バイト整列されていなければなりません" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1842,11 +1838,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBusにはまだ対応していません" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3675,7 +3666,7 @@ msgid "no module named '%q'" msgstr "'%q' という名前のモジュールはありません" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "利用可能なリセットピンがありません" @@ -3950,6 +3941,7 @@ msgstr "pow()の第3引数には整数が必要" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3970,6 +3962,7 @@ msgstr "pow()の第3引数には整数が必要" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4003,10 +3996,6 @@ msgstr "" msgid "queue overflow" msgstr "キューがオーバーフローしました" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "raw f-文字列は実装されていません" @@ -4500,6 +4489,9 @@ msgstr "ziはfloat値でなければなりません" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBusにはまだ対応していません" + #~ msgid "no available NIC" #~ msgstr "利用可能なNICがありません" diff --git a/locale/ko.po b/locale/ko.po index ffb73ab281..2da34c495c 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -36,13 +36,6 @@ msgid "" "https://github.com/adafruit/circuitpython/issues\n" msgstr "" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " 파일 \"%q\"" @@ -401,6 +394,9 @@ msgstr "사용중인 모든 SPI주변 기기" msgid "All UART peripherals are in use" msgstr "사용중인 모든 UART주변 기기" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -626,10 +622,10 @@ msgstr "잘못된 크기의 버퍼. >1 여야합니다" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "" @@ -789,7 +785,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "명령은 0에서 255 사이의 정수(int) 여야합니다" @@ -882,12 +878,12 @@ msgstr "" msgid "DAC already in use" msgstr "DAC가 현재 사용 중입니다" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1831,11 +1827,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3659,7 +3650,7 @@ msgid "no module named '%q'" msgstr "" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3932,6 +3923,7 @@ msgstr "" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3952,6 +3944,7 @@ msgstr "" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -3985,10 +3978,6 @@ msgstr "" msgid "queue overflow" msgstr "" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 2f5644be26..e89f2f0c09 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -38,13 +38,6 @@ msgstr "" "Meld een probleem met de inhoud van de CIRCUITPY drive op:\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " Bestand" @@ -403,6 +396,9 @@ msgstr "Alle SPI peripherals zijn in gebruik" msgid "All UART peripherals are in use" msgstr "Alle UART peripherals zijn in gebruik" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -628,10 +624,10 @@ msgstr "Buffer moet op zijn minst lengte 1 zijn" msgid "Buffer too short by %d bytes" msgstr "Buffer is %d bytes te klein" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d al in gebruik" @@ -793,7 +789,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Column entry moet digitalio.DigitalInOut zijn" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Command moet een int tussen 0 en 255 zijn" @@ -888,12 +884,12 @@ msgstr "DAC Apparaat Init Fout" msgid "DAC already in use" msgstr "DAC al in gebruik" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin moet byte uitgelijnd zijn" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1849,11 +1845,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus nog niet ondersteund" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3700,7 +3691,7 @@ msgid "no module named '%q'" msgstr "geen module met naam '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "geen reset pin beschikbaar" @@ -3974,6 +3965,7 @@ msgstr "pow() met 3 argumenten vereist integers" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3994,6 +3986,7 @@ msgstr "pow() met 3 argumenten vereist integers" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4027,10 +4020,6 @@ msgstr "" msgid "queue overflow" msgstr "wachtrij overloop" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "ruwe f-strings zijn niet geïmplementeerd" @@ -4525,6 +4514,9 @@ msgstr "zi moet van type float zijn" msgid "zi must be of shape (n_section, 2)" msgstr "zi moet vorm (n_section, 2) hebben" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus nog niet ondersteund" + #~ msgid "no available NIC" #~ msgstr "geen netwerkadapter (NIC) beschikbaar" diff --git a/locale/pl.po b/locale/pl.po index f4dbf0c1c7..ef0e0cce33 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -40,13 +40,6 @@ msgstr "" "Zgłoś problem z zawartością dysku CIRCUITPY pod adresem\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr " Plik \"%q\"" @@ -405,6 +398,9 @@ msgstr "Wszystkie peryferia SPI w użyciu" msgid "All UART peripherals are in use" msgstr "Wszystkie peryferia UART w użyciu" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "" @@ -630,10 +626,10 @@ msgstr "Bufor musi mieć długość 1 lub więcej" msgid "Buffer too short by %d bytes" msgstr "Bufor za krótki o %d bajtów" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Nóżka magistrali %d jest w użyciu" @@ -793,7 +789,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Kolumny muszą być typu digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Komenda musi być int pomiędzy 0 a 255" @@ -888,12 +884,12 @@ msgstr "Błąd inicjowania urządzenia DAC" msgid "DAC already in use" msgstr "DAC w użyciu" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Nóżka data 0 musi być wyrównana do bajtu" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "" @@ -1839,11 +1835,6 @@ msgstr "" msgid "PWM slice channel A already in use" msgstr "" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus nie jest jeszcze obsługiwany" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "" @@ -3673,7 +3664,7 @@ msgid "no module named '%q'" msgstr "brak modułu o nazwie '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "" @@ -3947,6 +3938,7 @@ msgstr "trzyargumentowe pow() wymaga liczb całkowitych" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -3967,6 +3959,7 @@ msgstr "trzyargumentowe pow() wymaga liczb całkowitych" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4000,10 +3993,6 @@ msgstr "" msgid "queue overflow" msgstr "przepełnienie kolejki" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "" @@ -4497,6 +4486,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus nie jest jeszcze obsługiwany" + #~ msgid "no available NIC" #~ msgstr "brak wolnego NIC" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 84c1b36d44..9c44b4cd93 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -42,16 +42,6 @@ msgstr "" "Registre um problema com o conteúdo do seu controlador no CIRCUITPY\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" -"\n" -"modo colar; Ctrl-C para cancelar, Ctrl-D para concluir\n" -"=== " - #: py/obj.c msgid " File \"%q\"" msgstr " Arquivo \"%q\"" @@ -416,6 +406,9 @@ msgstr "Todos os periféricos SPI estão em uso" msgid "All UART peripherals are in use" msgstr "Todos os periféricos UART estão em uso" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "Todos os canais estão em uso" @@ -644,10 +637,10 @@ msgstr "O comprimento do buffer deve ter pelo menos 1" msgid "Buffer too short by %d bytes" msgstr "O buffer é muito curto em %d bytes" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "O pino bus %d já está em uso" @@ -813,7 +806,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "A entrada da coluna deve ser digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "O comando deve ser um int entre 0 e 255" @@ -907,12 +900,12 @@ msgstr "Erro de Inicialização do Dispositivo DAC" msgid "DAC already in use" msgstr "DAC em uso" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "O pino de dados 0 deve ser alinhado por bytes" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "O pino de dados 0 deve ser alinhado por bytes." @@ -1876,11 +1869,6 @@ msgstr "A fatia do PWM já está em uso" msgid "PWM slice channel A already in use" msgstr "O canal A da fatia do PWM já está em uso" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "O ParallelBus ainda não é compatível" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "O periférico está em uso" @@ -3753,7 +3741,7 @@ msgid "no module named '%q'" msgstr "nenhum módulo chamado '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "nenhum pino de redefinição está disponível" @@ -4031,6 +4019,7 @@ msgstr "o pow() com 3 argumentos requer números inteiros" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4051,6 +4040,7 @@ msgstr "o pow() com 3 argumentos requer números inteiros" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4084,10 +4074,6 @@ msgstr "O pull_threshold deve ser entre 1 e 32" msgid "queue overflow" msgstr "estouro de fila" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "REPL bruto; CTRL-B para encerrar\n" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "o f-strings bruto não estão implementados" @@ -4582,6 +4568,21 @@ msgstr "zi deve ser de um tipo float" msgid "zi must be of shape (n_section, 2)" msgstr "zi deve estar na forma (n_section, 2)" +#~ msgid "" +#~ "\n" +#~ "paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" +#~ "=== " +#~ msgstr "" +#~ "\n" +#~ "modo colar; Ctrl-C para cancelar, Ctrl-D para concluir\n" +#~ "=== " + +#~ msgid "ParallelBus not yet supported" +#~ msgstr "O ParallelBus ainda não é compatível" + +#~ msgid "raw REPL; CTRL-B to exit\n" +#~ msgstr "REPL bruto; CTRL-B para encerrar\n" + #~ msgid "%q length must be %q" #~ msgstr "o comprimento %q deve ser %q" diff --git a/locale/sv.po b/locale/sv.po index 9a014fe9da..02e273b352 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -42,16 +42,6 @@ msgstr "" "Vänligen skapa ett ärende med innehållet i din CIRCUITPY-enhet på\n" "https://github.com/adafruit/circuitpython/issues\n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" -"\n" -"klistra in-läge; Ctrl-C för att avbryta, Ctrl-D för att avsluta\n" -"=== " - #: py/obj.c msgid " File \"%q\"" msgstr " Filen \"%q\"" @@ -411,6 +401,9 @@ msgstr "All SPI-kringutrustning används" msgid "All UART peripherals are in use" msgstr "Alla UART-kringutrustning används" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "Alla kanaler används" @@ -636,10 +629,10 @@ msgstr "Bufferten måste ha minst längd 1" msgid "Buffer too short by %d bytes" msgstr "Buffert är %d bytes för kort" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Busspinne %d används redan" @@ -802,7 +795,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Kolumnposten måste vara digitalio. DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Kommandot måste vara en int mellan 0 och 255" @@ -897,12 +890,12 @@ msgstr "Initieringsfel för DAC-enhet" msgid "DAC already in use" msgstr "DAC används redan" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Datapinne 0 måste vara bytejusterad" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "Datapinne 0 måste vara byte-justerad." @@ -1858,11 +1851,6 @@ msgstr "PWM-segment används redan" msgid "PWM slice channel A already in use" msgstr "PWM-segmentkanal A används redan" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "ParallelBus stöds ännu inte" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "Periferi i bruk" @@ -3716,7 +3704,7 @@ msgid "no module named '%q'" msgstr "ingen modul med namnet '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "ingen reset-pinne tillgänglig" @@ -3990,6 +3978,7 @@ msgstr "pow() med 3 argument kräver heltal" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4010,6 +3999,7 @@ msgstr "pow() med 3 argument kräver heltal" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4043,10 +4033,6 @@ msgstr "push_threshold måste vara mellan 1 och 32" msgid "queue overflow" msgstr "köstorlek överskreds" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "rå REPL. CTRL-B för att avsluta\n" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "råa f-strängar inte implementerade" @@ -4541,6 +4527,21 @@ msgstr "zi måste vara av typ float" msgid "zi must be of shape (n_section, 2)" msgstr "zi måste vara i formen (n_section, 2)" +#~ msgid "" +#~ "\n" +#~ "paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" +#~ "=== " +#~ msgstr "" +#~ "\n" +#~ "klistra in-läge; Ctrl-C för att avbryta, Ctrl-D för att avsluta\n" +#~ "=== " + +#~ msgid "ParallelBus not yet supported" +#~ msgstr "ParallelBus stöds ännu inte" + +#~ msgid "raw REPL; CTRL-B to exit\n" +#~ msgstr "rå REPL. CTRL-B för att avsluta\n" + #~ msgid "%q length must be %q" #~ msgstr "längden på %q måste vara %q" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 1d05df7b4e..2530d54950 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -43,16 +43,6 @@ msgstr "" "Qǐng tōngguò https://github.com/adafruit/circuitpython/issues\n" "tíjiāo yǒuguān nín de CIRCUITPY qūdòngqì nèiróng de wèntí \n" -#: lib/utils/pyexec.c -msgid "" -"\n" -"paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" -"=== " -msgstr "" -"\n" -"zhān tiē mó shì; Ctrl-C qǔ xiāo, Ctrl-D wán chéngh\n" -"=== " - #: py/obj.c msgid " File \"%q\"" msgstr " Wénjiàn \"%q\"" @@ -413,6 +403,9 @@ msgstr "Suǒyǒu SPI wàiwéi qì zhèngzài shǐyòng" msgid "All UART peripherals are in use" msgstr "Suǒyǒu UART wàiwéi zhèngzài shǐyòng" +#: ports/nrf/common-hal/countio/Counter.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" msgstr "suǒ yǒu shǐ yòng de tōng dào" @@ -638,10 +631,10 @@ msgstr "Huǎnchōng qū bìxū zhìshǎo chángdù 1" msgid "Buffer too short by %d bytes" msgstr "Huǎn chōng qū tài duǎn , àn %d zì jié" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/esp32s2/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c -#: ports/raspberrypi/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Zǒngxiàn yǐn jiǎo %d yǐ zài shǐyòng zhōng" @@ -803,7 +796,7 @@ msgid "Column entry must be digitalio.DigitalInOut" msgstr "Liè tiáomù bìxū shì digitalio.DigitalInOut" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "Command must be an int between 0 and 255" msgstr "Mìnglìng bìxū shì 0 dào 255 zhī jiān de int" @@ -896,12 +889,12 @@ msgstr "DAC shèbèi chūshǐhuà cuòwù" msgid "DAC already in use" msgstr "Fā yuán huì yǐjīng shǐyòng" -#: ports/atmel-samd/common-hal/displayio/ParallelBus.c -#: ports/nrf/common-hal/displayio/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Shùjù 0 de yǐn jiǎo bìxū shì zì jié duìqí" -#: ports/esp32s2/common-hal/displayio/ParallelBus.c +#: ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c msgid "Data 0 pin must be byte aligned." msgstr "shù jù 0 yǐn jiǎo bì xū àn zì jié duì qí." @@ -1860,11 +1853,6 @@ msgstr "yǐ jīng zài shǐ yòng de PWM qiē piàn" msgid "PWM slice channel A already in use" msgstr "PWM qiē piàn tōng dào A yǐ zài shǐ yòng zhōng" -#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c -#: ports/stm/common-hal/displayio/ParallelBus.c -msgid "ParallelBus not yet supported" -msgstr "Shàng bù zhīchí ParallelBus" - #: ports/esp32s2/common-hal/audiobusio/__init__.c msgid "Peripheral in use" msgstr "shǐ yòng zhōng de wài shè" @@ -3717,7 +3705,7 @@ msgid "no module named '%q'" msgstr "méiyǒu mókuài '%q'" #: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/displayio/ParallelBus.c +#: shared-bindings/paralleldisplay/ParallelBus.c msgid "no reset pin available" msgstr "Méiyǒu kěyòng de fùwèi yǐn jiǎo" @@ -3990,6 +3978,7 @@ msgstr "pow() yǒu 3 cānshù xūyào zhěngshù" #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/crumpspace_crumps2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_hmi_devkit_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h @@ -4010,6 +3999,7 @@ msgstr "pow() yǒu 3 cānshù xūyào zhěngshù" #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h +#: ports/esp32s2/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h msgid "pressing boot button at start up.\n" @@ -4043,10 +4033,6 @@ msgstr "tuī sòng yù zhí bì xū jiè yú 1 hé 32 zhī jiān" msgid "queue overflow" msgstr "duìliè yìchū" -#: lib/utils/pyexec.c -msgid "raw REPL; CTRL-B to exit\n" -msgstr "yuán shǐ REPL; CTRL-B tuì chū\n" - #: py/parse.c msgid "raw f-strings are not implemented" msgstr "wèi zhíxíng yuánshǐ f-strings" @@ -4541,6 +4527,21 @@ msgstr "zi bìxū wèi fú diǎn xíng" msgid "zi must be of shape (n_section, 2)" msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)" +#~ msgid "" +#~ "\n" +#~ "paste mode; Ctrl-C to cancel, Ctrl-D to finish\n" +#~ "=== " +#~ msgstr "" +#~ "\n" +#~ "zhān tiē mó shì; Ctrl-C qǔ xiāo, Ctrl-D wán chéngh\n" +#~ "=== " + +#~ msgid "ParallelBus not yet supported" +#~ msgstr "Shàng bù zhīchí ParallelBus" + +#~ msgid "raw REPL; CTRL-B to exit\n" +#~ msgstr "yuán shǐ REPL; CTRL-B tuì chū\n" + #~ msgid "%q length must be %q" #~ msgstr "%q cháng dù bì xū wéi %q" diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 66cf4e2008..01050324f5 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -103,6 +103,18 @@ CFLAGS += $(OPTIMIZATION_FLAGS) CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) +# Nordic Softdevice SDK header files contains inline assembler that has +# broken constraints. As a result the IPA-modref pass, introduced in gcc-11, +# is able to "prove" that arguments to wrapper functions generated with +# the SVCALL() macro are unused and, as a result, the optimizer will remove +# code within the callers that sets up these arguments (which results in +# a broken bootloader). The broken headers come from Nordic-supplied zip +# files and are not trivial to patch so, for now, we'll simply disable the +# new gcc-11 inter-procedural optimizations. +ifeq (,$(findstring unrecognized,$(shell $(CC) $(CFLAGS) -fno-ipa-modref 2>&1))) +CFLAGS += -fno-ipa-modref +endif + # Undo some warnings. # nrfx does casts that increase alignment requirements. CFLAGS += -Wno-cast-align diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c b/ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c index bdc110cba3..8bc4ead19b 100644 --- a/ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c +++ b/ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c @@ -12,6 +12,11 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_P0_31) }, + { MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P0_01) }, + + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_04) }, + { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_04) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_08) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_06) }, diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c index f4302b839d..288cf2f217 100644 --- a/ports/nrf/common-hal/_bleio/Adapter.c +++ b/ports/nrf/common-hal/_bleio/Adapter.c @@ -507,6 +507,16 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t } self->scan_results = NULL; } + // Check to see if advertising is going already. + if (self->current_advertising_data != NULL && self->current_advertising_data == self->advertising_data) { + check_nrf_error(NRF_ERROR_BUSY); + } + + // If the current advertising data isn't owned by the adapter then it must be an internal + // advertisement that we should stop. + if (self->current_advertising_data != NULL) { + common_hal_bleio_adapter_stop_advertising(self); + } self->scan_results = shared_module_bleio_new_scanresults(buffer_size, prefixes, prefix_length, minimum_rssi); size_t max_packet_size = extended ? BLE_GAP_SCAN_BUFFER_EXTENDED_MAX_SUPPORTED : BLE_GAP_SCAN_BUFFER_MAX; uint8_t *raw_data = m_malloc(sizeof(ble_data_t) + max_packet_size, false); diff --git a/ports/nrf/common-hal/audiobusio/I2SOut.c b/ports/nrf/common-hal/audiobusio/I2SOut.c index ded03c07c2..8626ce714d 100644 --- a/ports/nrf/common-hal/audiobusio/I2SOut.c +++ b/ports/nrf/common-hal/audiobusio/I2SOut.c @@ -230,7 +230,7 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, } bool common_hal_audiobusio_i2sout_deinited(audiobusio_i2sout_obj_t *self) { - return self->data_pin_number == 0xff; + return self->data_pin_number == NO_PIN; } void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t *self) { @@ -240,11 +240,11 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t *self) { NRF_I2S->TASKS_STOP = 1; NRF_I2S->ENABLE = I2S_ENABLE_ENABLE_Disabled; reset_pin_number(self->bit_clock_pin_number); - self->bit_clock_pin_number = 0xff; + self->bit_clock_pin_number = NO_PIN; reset_pin_number(self->word_select_pin_number); - self->word_select_pin_number = 0xff; + self->word_select_pin_number = NO_PIN; reset_pin_number(self->data_pin_number); - self->data_pin_number = 0xff; + self->data_pin_number = NO_PIN; instance = NULL; supervisor_disable_tick(); } diff --git a/ports/nrf/common-hal/audiobusio/PDMIn.c b/ports/nrf/common-hal/audiobusio/PDMIn.c index 47d7365777..c34a4ebba9 100644 --- a/ports/nrf/common-hal/audiobusio/PDMIn.c +++ b/ports/nrf/common-hal/audiobusio/PDMIn.c @@ -69,16 +69,16 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self, } bool common_hal_audiobusio_pdmin_deinited(audiobusio_pdmin_obj_t *self) { - return !self->clock_pin_number; + return self->clock_pin_number == NO_PIN; } void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t *self) { nrf_pdm->ENABLE = 0; reset_pin_number(self->clock_pin_number); - self->clock_pin_number = 0; + self->clock_pin_number = NO_PIN; reset_pin_number(self->data_pin_number); - self->data_pin_number = 0; + self->data_pin_number = NO_PIN; } uint8_t common_hal_audiobusio_pdmin_get_bit_depth(audiobusio_pdmin_obj_t *self) { diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c b/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c new file mode 100644 index 0000000000..de6e424ed9 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/board.c @@ -0,0 +1,40 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} + +void board_deinit(void) { +} diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/mpconfigboard.h b/ports/raspberrypi/boards/challenger_rp2040_wifi/mpconfigboard.h new file mode 100644 index 0000000000..8382822b29 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/mpconfigboard.h @@ -0,0 +1,10 @@ +#define MICROPY_HW_BOARD_NAME "Challenger RP2040 WiFi" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define DEFAULT_UART_BUS_TX (&pin_GPIO16) +#define DEFAULT_UART_BUS_RX (&pin_GPIO16) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO0) +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO1) +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO22) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO23) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO24) diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/mpconfigboard.mk b/ports/raspberrypi/boards/challenger_rp2040_wifi/mpconfigboard.mk new file mode 100644 index 0000000000..1f1ff5a391 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x2e8a +USB_PID = 0x1006 +USB_PRODUCT = "Challenger RP2040 WiFi" +USB_MANUFACTURER = "Invector Labs" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/pico-sdk-configboard.h b/ports/raspberrypi/boards/challenger_rp2040_wifi/pico-sdk-configboard.h new file mode 100644 index 0000000000..36da55d457 --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c b/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c new file mode 100644 index 0000000000..baec08eccb --- /dev/null +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c @@ -0,0 +1,73 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + + { MP_ROM_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + + { MP_ROM_QSTR(MP_QSTR_WIFI_MODE), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_WIFI_RESET), MP_ROM_PTR(&pin_GPIO19) }, + + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c index e22286ca3d..68518d75b3 100644 --- a/ports/raspberrypi/common-hal/microcontroller/Processor.c +++ b/ports/raspberrypi/common-hal/microcontroller/Processor.c @@ -34,6 +34,11 @@ #include "src/rp2_common/hardware_adc/include/hardware/adc.h" #include "src/rp2_common/hardware_clocks/include/hardware/clocks.h" +#include "src/rp2040/hardware_regs/include/hardware/regs/vreg_and_chip_reset.h" +#include "src/rp2040/hardware_regs/include/hardware/regs/watchdog.h" +#include "src/rp2040/hardware_structs/include/hardware/structs/vreg_and_chip_reset.h" +#include "src/rp2040/hardware_structs/include/hardware/structs/watchdog.h" + float common_hal_mcu_processor_get_temperature(void) { adc_init(); adc_set_temp_sensor_enabled(true); @@ -60,5 +65,34 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) { } mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) { - return RESET_REASON_UNKNOWN; + mcu_reset_reason_t reason = RESET_REASON_UNKNOWN; + + uint32_t watchdog_reset_reg = watchdog_hw->reason; + uint32_t chip_reset_reg = vreg_and_chip_reset_hw->chip_reset; + + if (chip_reset_reg & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_PSM_RESTART_BITS) { + reason = RESET_REASON_RESCUE_DEBUG; + } + + if (chip_reset_reg & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_RUN_BITS) { + reason = RESET_REASON_RESET_PIN; + } + + if (chip_reset_reg & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_POR_BITS) { + // NOTE: This register is also used for brownout, but there is no way to differentiate between power on and brown out + reason = RESET_REASON_POWER_ON; + } + + // Check watchdog after chip reset since watchdog doesn't clear chip_reset, while chip_reset clears the watchdog + + if (watchdog_reset_reg & WATCHDOG_REASON_TIMER_BITS) { + // This bit can also be set during a software reset because the pico-sdk performs a software reset by setting an extremely low timeout on the watchdog, rather than triggering a watchdog reset manually + reason = RESET_REASON_WATCHDOG; + } + + if (watchdog_reset_reg & WATCHDOG_REASON_FORCE_BITS) { + reason = RESET_REASON_SOFTWARE; + } + + return reason; } diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c index 1750e55204..905c19f83f 100644 --- a/shared-bindings/microcontroller/ResetReason.c +++ b/shared-bindings/microcontroller/ResetReason.c @@ -36,6 +36,7 @@ MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, DEEP_SLEEP_ALARM, RESET_REA MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, RESET_PIN, RESET_REASON_RESET_PIN); MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, WATCHDOG, RESET_REASON_WATCHDOG); MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, UNKNOWN, RESET_REASON_UNKNOWN); +MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, RESCUE_DEBUG, RESET_REASON_RESCUE_DEBUG); //| class ResetReason: //| """The reason the microntroller was last reset""" @@ -61,6 +62,9 @@ MAKE_ENUM_VALUE(mcu_reset_reason_type, reset_reason, UNKNOWN, RESET_REASON_UNKNO //| UNKNOWN: object //| """The microntroller restarted for an unknown reason.""" //| +//| RESCUE_DEBUG: object +//| """The microntroller was reset by the rescue debug port.""" +//| MAKE_ENUM_MAP(mcu_reset_reason) { MAKE_ENUM_MAP_ENTRY(reset_reason, POWER_ON), MAKE_ENUM_MAP_ENTRY(reset_reason, BROWNOUT), @@ -69,6 +73,7 @@ MAKE_ENUM_MAP(mcu_reset_reason) { MAKE_ENUM_MAP_ENTRY(reset_reason, RESET_PIN), MAKE_ENUM_MAP_ENTRY(reset_reason, WATCHDOG), MAKE_ENUM_MAP_ENTRY(reset_reason, UNKNOWN), + MAKE_ENUM_MAP_ENTRY(reset_reason, RESCUE_DEBUG), }; STATIC MP_DEFINE_CONST_DICT(mcu_reset_reason_locals_dict, mcu_reset_reason_locals_table); diff --git a/shared-bindings/microcontroller/ResetReason.h b/shared-bindings/microcontroller/ResetReason.h index 8ed5e48315..7abc54c00b 100644 --- a/shared-bindings/microcontroller/ResetReason.h +++ b/shared-bindings/microcontroller/ResetReason.h @@ -38,6 +38,7 @@ typedef enum { RESET_REASON_RESET_PIN, RESET_REASON_WATCHDOG, RESET_REASON_UNKNOWN, + RESET_REASON_RESCUE_DEBUG, } mcu_reset_reason_t; extern const mp_obj_type_t mcu_reset_reason_type;