djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'adafruit:main' into main

Browse Source
This commit is contained in:
Pontus Oldberg 2022-12-22 21:28:34 +01:00 committed by GitHub
commit 4bd5316929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
locale/pt_BR.po
View File

@ -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 <wellingtonuemura@gmail.com>\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."

14
locale/sv.po
View File

@ -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 <jonny@bergdahl.it>\n"
"Language-Team: LANGUAGE <LL@li.org>\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."

2
ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
View File

@ -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

2
ports/espressif/boards/luatos_core_esp32c3/pins.c
View File

@ -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) },

6
tools/ci_set_matrix.py
View File

@ -58,6 +58,9 @@ 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:
print("Using files list on commandline")
changed_files = sys.argv[1:]
@ -149,8 +152,7 @@ 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 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