From f97925c66c20972c68e6eb96219342974eb2b62d Mon Sep 17 00:00:00 2001 From: Bernhard Bablok Date: Wed, 21 Dec 2022 13:27:23 +0100 Subject: [PATCH 1/6] ignore .devcontainer/* --- tools/ci_set_matrix.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py index 3ec3ba9b73..79ec5c7ace 100755 --- a/tools/ci_set_matrix.py +++ b/tools/ci_set_matrix.py @@ -58,6 +58,8 @@ IGNORE = [ "tools/ci_check_duplicate_usb_vid_pid.py", ] +IGNORE_DIRS = ["tests", "docs", ".devcontainer"] + if len(sys.argv) > 1: print("Using files list on commandline") changed_files = sys.argv[1:] @@ -150,7 +152,7 @@ def set_boards_to_build(build_all): continue # Boards don't run tests or docs so ignore those as well. - if p.startswith("tests") or p.startswith("docs"): + if any([p.startswith(d) for d in IGNORE_DIRS]): continue # As a (nearly) last resort, for some certain files, we compute the settings from the From 868a98323a4bcefb5acb47da0ba82c07edf8f486 Mon Sep 17 00:00:00 2001 From: Bernhard Bablok Date: Wed, 21 Dec 2022 15:18:33 +0100 Subject: [PATCH 2/6] added comment for IGNORE_DIRS --- tools/ci_set_matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py index 79ec5c7ace..77f58742cd 100755 --- a/tools/ci_set_matrix.py +++ b/tools/ci_set_matrix.py @@ -58,6 +58,7 @@ IGNORE = [ "tools/ci_check_duplicate_usb_vid_pid.py", ] +# Files in these directories never influence board builds IGNORE_DIRS = ["tests", "docs", ".devcontainer"] if len(sys.argv) > 1: @@ -151,7 +152,6 @@ def set_boards_to_build(build_all): if p in IGNORE: continue - # Boards don't run tests or docs so ignore those as well. if any([p.startswith(d) for d in IGNORE_DIRS]): continue From e80ff2058373533c565b6962287e8511f2d498f2 Mon Sep 17 00:00:00 2001 From: evildave666 Date: Thu, 22 Dec 2022 09:29:24 +0900 Subject: [PATCH 3/6] Remove IO11 from definition It is used internally on this particular board version despite being broken out to a pin and marked on silkscreen. --- ports/espressif/boards/luatos_core_esp32c3/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/luatos_core_esp32c3/pins.c b/ports/espressif/boards/luatos_core_esp32c3/pins.c index b472446fe2..f45205b5c3 100644 --- a/ports/espressif/boards/luatos_core_esp32c3/pins.c +++ b/ports/espressif/boards/luatos_core_esp32c3/pins.c @@ -24,7 +24,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) }, { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) }, { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, - { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) }, + // IO11 used internally on this board version despite being broken out to a pin { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) }, { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO12) }, { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) }, From 7cfdd24f771e9e018a5f63364c5d4c08694a3384 Mon Sep 17 00:00:00 2001 From: evildave666 Date: Thu, 22 Dec 2022 09:30:52 +0900 Subject: [PATCH 4/6] Change flash mode to dio --- ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk index 29f1719153..e0df58f756 100644 --- a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk +++ b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk @@ -3,6 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001 IDF_TARGET = esp32c3 -CIRCUITPY_ESP_FLASH_MODE=qio +CIRCUITPY_ESP_FLASH_MODE=dio CIRCUITPY_ESP_FLASH_FREQ=80m CIRCUITPY_ESP_FLASH_SIZE=4MB From 26143e057fcd6b74187baf682d7b5740ef1918bd Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Wed, 21 Dec 2022 15:15:39 +0000 Subject: [PATCH 5/6] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (995 of 995 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/ --- locale/pt_BR.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 4a95e608d4..39b93d335f 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2022-12-16 21:50+0000\n" +"PO-Revision-Date: 2022-12-22 15:49+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.15\n" +"X-Generator: Weblate 4.15.1-dev\n" #: main.c msgid "" @@ -408,7 +408,7 @@ msgstr "O endereço deve ter %d bytes de comprimento" #: ports/espressif/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" -msgstr "" +msgstr "Intervalo de endereços não permitido" #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" @@ -1683,7 +1683,7 @@ msgstr "Apenas um %q pode ser colocado em hibernação profunda." #: ports/espressif/common-hal/espulp/ULPAlarm.c msgid "Only one %q can be set." -msgstr "" +msgstr "Apenas um %q pode ser definido." #: ports/espressif/common-hal/i2ctarget/I2CTarget.c #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c @@ -1807,7 +1807,7 @@ msgstr "" #: ports/espressif/common-hal/espulp/ULP.c msgid "Pins 21+ not supported from ULP" -msgstr "" +msgstr "Os pinos 21+ não são suportados pelo ULP" #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c msgid "Pins must be sequential" @@ -1860,7 +1860,7 @@ msgstr "O tamanho do programa é inválido" #: ports/espressif/common-hal/espulp/ULP.c msgid "Program too long" -msgstr "" +msgstr "Programa muito longo" #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." @@ -2296,7 +2296,7 @@ msgstr "Não é possível iniciar a consulta mDNS" #: shared-bindings/memorymap/AddressRange.c msgid "Unable to write to address." -msgstr "" +msgstr "Não é possível gravar no endereço." #: shared-bindings/nvm/ByteArray.c msgid "Unable to write to nvm." From 9bf62d1433d7bf008c5306f80da68c6610942d8d Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Wed, 21 Dec 2022 14:44:03 +0000 Subject: [PATCH 6/6] Translated using Weblate (Swedish) Currently translated at 100.0% (995 of 995 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index 74cd6978c7..1ad79178d7 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2022-12-15 12:49+0000\n" +"PO-Revision-Date: 2022-12-22 15:49+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.15-dev\n" +"X-Generator: Weblate 4.15.1-dev\n" #: main.c msgid "" @@ -405,7 +405,7 @@ msgstr "Adressen måste vara %d byte lång" #: ports/espressif/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" -msgstr "" +msgstr "Adressintervallet är inte tillåtet" #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" @@ -1666,7 +1666,7 @@ msgstr "Endast en %q kan sättas i djup sömn." #: ports/espressif/common-hal/espulp/ULPAlarm.c msgid "Only one %q can be set." -msgstr "" +msgstr "Endast en %q kan ställas in." #: ports/espressif/common-hal/i2ctarget/I2CTarget.c #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c @@ -1790,7 +1790,7 @@ msgstr "" #: ports/espressif/common-hal/espulp/ULP.c msgid "Pins 21+ not supported from ULP" -msgstr "" +msgstr "Pins 21+ stöds inte av ULP" #: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c msgid "Pins must be sequential" @@ -1840,7 +1840,7 @@ msgstr "Programstorlek ogiltig" #: ports/espressif/common-hal/espulp/ULP.c msgid "Program too long" -msgstr "" +msgstr "Programmet är för långt" #: shared-bindings/digitalio/DigitalInOut.c msgid "Pull not used when direction is output." @@ -2272,7 +2272,7 @@ msgstr "Det gick inte att starta mDNS-frågan" #: shared-bindings/memorymap/AddressRange.c msgid "Unable to write to address." -msgstr "" +msgstr "Det går inte att skriva till adress." #: shared-bindings/nvm/ByteArray.c msgid "Unable to write to nvm."