Skip to content

Commit 4bd5316

Browse files
authored
Merge branch 'adafruit:main' into main
2 parents c719c9b + a930756 commit 4bd5316

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

locale/pt_BR.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2022-12-16 21:50+0000\n"
9+
"PO-Revision-Date: 2022-12-22 15:49+0000\n"
1010
"Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
1111
"Language-Team: \n"
1212
"Language: pt_BR\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
1616
"Plural-Forms: nplurals=2; plural=n > 1;\n"
17-
"X-Generator: Weblate 4.15\n"
17+
"X-Generator: Weblate 4.15.1-dev\n"
1818

1919
#: main.c
2020
msgid ""
@@ -408,7 +408,7 @@ msgstr "O endereço deve ter %d bytes de comprimento"
408408

409409
#: ports/espressif/common-hal/memorymap/AddressRange.c
410410
msgid "Address range not allowed"
411-
msgstr ""
411+
msgstr "Intervalo de endereços não permitido"
412412

413413
#: ports/espressif/common-hal/canio/CAN.c
414414
msgid "All CAN peripherals are in use"
@@ -1683,7 +1683,7 @@ msgstr "Apenas um %q pode ser colocado em hibernação profunda."
16831683

16841684
#: ports/espressif/common-hal/espulp/ULPAlarm.c
16851685
msgid "Only one %q can be set."
1686-
msgstr ""
1686+
msgstr "Apenas um %q pode ser definido."
16871687

16881688
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
16891689
#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1807,7 +1807,7 @@ msgstr ""
18071807

18081808
#: ports/espressif/common-hal/espulp/ULP.c
18091809
msgid "Pins 21+ not supported from ULP"
1810-
msgstr ""
1810+
msgstr "Os pinos 21+ não são suportados pelo ULP"
18111811

18121812
#: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
18131813
msgid "Pins must be sequential"
@@ -1860,7 +1860,7 @@ msgstr "O tamanho do programa é inválido"
18601860

18611861
#: ports/espressif/common-hal/espulp/ULP.c
18621862
msgid "Program too long"
1863-
msgstr ""
1863+
msgstr "Programa muito longo"
18641864

18651865
#: shared-bindings/digitalio/DigitalInOut.c
18661866
msgid "Pull not used when direction is output."
@@ -2296,7 +2296,7 @@ msgstr "Não é possível iniciar a consulta mDNS"
22962296

22972297
#: shared-bindings/memorymap/AddressRange.c
22982298
msgid "Unable to write to address."
2299-
msgstr ""
2299+
msgstr "Não é possível gravar no endereço."
23002300

23012301
#: shared-bindings/nvm/ByteArray.c
23022302
msgid "Unable to write to nvm."

locale/sv.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2022-12-15 12:49+0000\n"
9+
"PO-Revision-Date: 2022-12-22 15:49+0000\n"
1010
"Last-Translator: Jonny Bergdahl <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
1212
"Language: sv\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
1616
"Plural-Forms: nplurals=2; plural=n != 1;\n"
17-
"X-Generator: Weblate 4.15-dev\n"
17+
"X-Generator: Weblate 4.15.1-dev\n"
1818

1919
#: main.c
2020
msgid ""
@@ -405,7 +405,7 @@ msgstr "Adressen måste vara %d byte lång"
405405

406406
#: ports/espressif/common-hal/memorymap/AddressRange.c
407407
msgid "Address range not allowed"
408-
msgstr ""
408+
msgstr "Adressintervallet är inte tillåtet"
409409

410410
#: ports/espressif/common-hal/canio/CAN.c
411411
msgid "All CAN peripherals are in use"
@@ -1666,7 +1666,7 @@ msgstr "Endast en %q kan sättas i djup sömn."
16661666

16671667
#: ports/espressif/common-hal/espulp/ULPAlarm.c
16681668
msgid "Only one %q can be set."
1669-
msgstr ""
1669+
msgstr "Endast en %q kan ställas in."
16701670

16711671
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
16721672
#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -1790,7 +1790,7 @@ msgstr ""
17901790

17911791
#: ports/espressif/common-hal/espulp/ULP.c
17921792
msgid "Pins 21+ not supported from ULP"
1793-
msgstr ""
1793+
msgstr "Pins 21+ stöds inte av ULP"
17941794

17951795
#: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
17961796
msgid "Pins must be sequential"
@@ -1840,7 +1840,7 @@ msgstr "Programstorlek ogiltig"
18401840

18411841
#: ports/espressif/common-hal/espulp/ULP.c
18421842
msgid "Program too long"
1843-
msgstr ""
1843+
msgstr "Programmet är för långt"
18441844

18451845
#: shared-bindings/digitalio/DigitalInOut.c
18461846
msgid "Pull not used when direction is output."
@@ -2272,7 +2272,7 @@ msgstr "Det gick inte att starta mDNS-frågan"
22722272

22732273
#: shared-bindings/memorymap/AddressRange.c
22742274
msgid "Unable to write to address."
2275-
msgstr ""
2275+
msgstr "Det går inte att skriva till adress."
22762276

22772277
#: shared-bindings/nvm/ByteArray.c
22782278
msgid "Unable to write to nvm."

ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
33

44
IDF_TARGET = esp32c3
55

6-
CIRCUITPY_ESP_FLASH_MODE=qio
6+
CIRCUITPY_ESP_FLASH_MODE=dio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB

ports/espressif/boards/luatos_core_esp32c3/pins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
2424
{ MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
2525
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
2626
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
27-
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
27+
// IO11 used internally on this board version despite being broken out to a pin
2828
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
2929
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO12) },
3030
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },

tools/ci_set_matrix.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
"tools/ci_check_duplicate_usb_vid_pid.py",
5959
]
6060

61+
# Files in these directories never influence board builds
62+
IGNORE_DIRS = ["tests", "docs", ".devcontainer"]
63+
6164
if len(sys.argv) > 1:
6265
print("Using files list on commandline")
6366
changed_files = sys.argv[1:]
@@ -149,8 +152,7 @@ def get_settings(board):
149152
if p in IGNORE:
150153
continue
151154

152-
# Boards don't run tests or docs so ignore those as well.
153-
if p.startswith("tests") or p.startswith("docs"):
155+
if any([p.startswith(d) for d in IGNORE_DIRS]):
154156
continue
155157

156158
# As a (nearly) last resort, for some certain files, we compute the settings from the

0 commit comments

Comments
 (0)