Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd3c0482

Browse files
authored
Merge branch 'adafruit:main' into main
2 parentse76d2e4 +3512e66 commitd3c0482

File tree

102 files changed

+320
-250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+320
-250
lines changed

‎.devcontainer/cortex-m-toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ wget -qO gcc-arm-none-eabi.tar.xz \
1717
https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
1818

1919
tar -xJf gcc-arm-none-eabi.tar.xz
20-
ln -s arm-gnu-toolchain-14.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
20+
ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
2121
rm -f gcc-arm-none-eabi.tar.xz
2222

2323
echo -e"[cortex-m-toolchain.sh] update PATH in environment"

‎docs/environment.rst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ Details of the toml language subset
5353
CircuitPython behavior
5454
----------------------
5555

56-
CircuitPython will also read the environment to configure its behavior. Other
57-
keys are ignored by CircuitPython. Here are the keys it uses:
56+
CircuitPython will also read the environment to configure its behavior. Some keys are read at
57+
startup once and others are read on reload (ctrl-D in the REPL). If a reload doesn't change things,
58+
then try a reset (a power cycle or pressing the reset button). Other keys are ignored by CircuitPython.
59+
Here are the keys it uses:
5860

5961
Core CircuitPython keys
6062
^^^^^^^^^^^^^^^^^^^^^^^

‎locale/es.po‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgstr ""
88
"Project-Id-Version:\n"
99
"Report-Msgid-Bugs-To:\n"
1010
"POT-Creation-Date:2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date:2025-06-09 12:01+0000\n"
12-
"Last-Translator:MAE <martin-aehle@hotmail.de>\n"
11+
"PO-Revision-Date:2025-07-17 04:01+0000\n"
12+
"Last-Translator:Jean Serrano <yeanse@aol.com>\n"
1313
"Language-Team:\n"
1414
"Language:es\n"
1515
"MIME-Version:1.0\n"
1616
"Content-Type:text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding:8bit\n"
1818
"Plural-Forms:nplurals=2; plural=n != 1;\n"
19-
"X-Generator:Weblate 5.12-dev\n"
19+
"X-Generator:Weblate 5.13-dev\n"
2020

2121
#: main.c
2222
msgid""
@@ -614,8 +614,10 @@ msgid "Array values should be single bytes."
614614
msgstr"Valores del array deben ser bytes individuales."
615615

616616
#: ports/atmel-samd/common-hal/spitarget/SPITarget.c
617+
#,fuzzy
617618
msgid"Async SPI transfer in progress on this bus, keep awaiting."
618619
msgstr""
620+
"Transferencia SPI asíncrona en curso en este canal, manténgase esperando."
619621

620622
#: shared-module/memorymonitor/AllocationAlarm.c
621623
#,c-format
@@ -819,7 +821,7 @@ msgstr "No se puede grabar en un archivo"
819821

820822
#: shared-module/storage/__init__.c
821823
msgid"Cannot remount path when visible via USB."
822-
msgstr""
824+
msgstr"No se puede volver a montar path mientras es visible a través de USB."
823825

824826
#: shared-bindings/digitalio/DigitalInOut.c
825827
msgid"Cannot set value when direction is input."
@@ -876,7 +878,7 @@ msgstr "Las matrices de coordenadas tienen diferentes tamaños"
876878

877879
#: ports/espressif/common-hal/rclcpy/Publisher.c
878880
msgid"Could not publish to ROS topic"
879-
msgstr""
881+
msgstr"No se pudo publicar al tema ROS"
880882

881883
#: shared-bindings/_bleio/Adapter.c
882884
msgid"Could not set address"
@@ -893,7 +895,7 @@ msgstr "No se pudo encontrar el decodificador"
893895
#: ports/espressif/common-hal/rclcpy/__init__.c
894896
#,c-format
895897
msgid"Critical ROS failure during soft reboot, reset required: %d"
896-
msgstr""
898+
msgstr"Fallo ROS critico durante reinicio suave, se requiere reiniciar: %d"
897899

898900
#: ports/stm/common-hal/analogio/AnalogOut.c
899901
msgid"DAC Channel Init Error"
@@ -1062,8 +1064,9 @@ msgid "Failed to create continuous channels: not found"
10621064
msgstr"Error al crear canales continuos: no encontrado"
10631065

10641066
#: ports/espressif/common-hal/audioio/AudioOut.c
1067+
#,fuzzy
10651068
msgid"Failed to enable continuous"
1066-
msgstr""
1069+
msgstr"Fallo habilitando continous"
10671070

10681071
#: shared-module/audiomp3/MP3Decoder.c
10691072
msgid"Failed to parse MP3 file"
@@ -1339,7 +1342,7 @@ msgstr "Dirección MAC inválida"
13391342

13401343
#: ports/espressif/common-hal/rclcpy/__init__.c
13411344
msgid"Invalid ROS domain ID"
1342-
msgstr""
1345+
msgstr"ID de dominio ROS invalido"
13431346

13441347
#: ports/espressif/common-hal/espidf/__init__.c py/moderrno.c
13451348
msgid"Invalid argument"
@@ -1434,7 +1437,7 @@ msgstr "Seguridad MITM no compatible"
14341437
#: ports/stm/common-hal/sdioio/SDCard.c
14351438
#,c-format
14361439
msgid"MMC/SDIO Clock Error %x"
1437-
msgstr""
1440+
msgstr"Error de Reloj MMC/SDIO %x"
14381441

14391442
#: shared-bindings/is31fl3741/IS31FL3741.c
14401443
msgid"Mapping must be a tuple"
@@ -1800,8 +1803,10 @@ msgid "PWM slice channel A already in use"
18001803
msgstr"Segmento del PWM canal A ya esta en uso"
18011804

18021805
#: shared-bindings/spitarget/SPITarget.c
1806+
#,fuzzy
18031807
msgid"Packet buffers for an SPI transfer must have the same length."
18041808
msgstr""
1809+
"Búferes de paquetes para transferencia SPI deben de ser de igual longitud"
18051810

18061811
#: shared-module/jpegio/JpegDecoder.c
18071812
msgid"Parameter error"
@@ -1908,8 +1913,9 @@ msgid "Program too long"
19081913
msgstr"El programa es demasiado grande"
19091914

19101915
#: shared-bindings/rclcpy/Publisher.c
1916+
#,fuzzy
19111917
msgid"Publishers can only be created from a parent node"
1912-
msgstr""
1918+
msgstr"Publicadores solo pueden ser creados desde un nodo padre"
19131919

19141920
#: shared-bindings/digitalio/DigitalInOut.c
19151921
msgid"Pull not used when direction is output."
@@ -1933,23 +1939,23 @@ msgstr "Error de inicialización de RNG"
19331939

19341940
#: ports/espressif/common-hal/rclcpy/__init__.c
19351941
msgid"ROS failed to initialize. Is agent connected?"
1936-
msgstr""
1942+
msgstr"Fallo al inicializar ROS, El agente esta conectado?"
19371943

19381944
#: ports/espressif/common-hal/rclcpy/__init__.c
19391945
msgid"ROS internal setup failure"
1940-
msgstr""
1946+
msgstr"Fallo interno de instalación ROS"
19411947

19421948
#: ports/espressif/common-hal/rclcpy/__init__.c
19431949
msgid"ROS memory allocator failure"
1944-
msgstr""
1950+
msgstr"Fallo de asignación de memoria ROS"
19451951

19461952
#: ports/espressif/common-hal/rclcpy/Node.c
19471953
msgid"ROS node failed to initialize"
1948-
msgstr""
1954+
msgstr"Fallo al inicializar nodo ROS"
19491955

19501956
#: ports/espressif/common-hal/rclcpy/Publisher.c
19511957
msgid"ROS topic failed to initialize"
1952-
msgstr""
1958+
msgstr"Fallo al inicializar Tema ROS"
19531959

19541960
#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
19551961
#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
@@ -2165,8 +2171,9 @@ msgid "Tile width must exactly divide bitmap width"
21652171
msgstr"Ancho del Tile debe dividir exactamente el ancho de mapa de bits"
21662172

21672173
#: shared-module/tilepalettemapper/TilePaletteMapper.c
2174+
#,fuzzy
21682175
msgid"TilePaletteMapper may only be bound to a TileGrid once"
2169-
msgstr""
2176+
msgstr"Tilepalettemapper sólo puede vincularse una vez a un TileGrid"
21702177

21712178
#: shared-bindings/alarm/time/TimeAlarm.c
21722179
msgid"Time is in the past."

‎locale/nl.po‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ 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:2025-06-30 16:01+0000\n"
10-
"Last-Translator:MAE <martin-aehle@hotmail.de>\n"
9+
"PO-Revision-Date:2025-07-13 16:01+0000\n"
10+
"Last-Translator:Mirthe Winter <mirthemwinter@gmail.com>\n"
1111
"Language-Team:none\n"
1212
"Language:nl\n"
1313
"MIME-Version:1.0\n"
@@ -49,7 +49,7 @@ msgstr ""
4949

5050
#: py/obj.c
5151
msgid" File\"%q\""
52-
msgstr" Bestand"
52+
msgstr" Bestand\"%q\""
5353

5454
#: py/obj.c
5555
msgid" File\"%q\", line %d"
@@ -631,8 +631,8 @@ msgid ""
631631
"Auto-reload is on. Simply save files over USB to run them or enter REPL to "
632632
"disable.\n"
633633
msgstr""
634-
"Auto-herlaad staat aan. Sla bestanden simpelwegop overUSB om uit te voeren "
635-
"of start REPL om uit te schakelen.\n"
634+
"Auto-herlaad staat aan. Sla bestanden simpelwegviaUSBopomzeuit te "
635+
"voerenof start REPL om ze uit te schakelen.\n"
636636

637637
#: ports/espressif/common-hal/canio/CAN.c
638638
msgid"Baudrate not supported by peripheral"
@@ -1845,7 +1845,7 @@ msgstr "Prefix buffer moet op de heap zijn"
18451845
#: main.c
18461846
msgid"Press any key to enter the REPL. Use CTRL-D to reload.\n"
18471847
msgstr""
1848-
"Druk een willekeurige toets om de REPL te starten. Gebruik CTRL+D om te "
1848+
"Drukopeen willekeurige toets om de REPL te starten. Gebruik CTRL+D om te "
18491849
"herstarten.\n"
18501850

18511851
#: main.c

‎locale/zh_Latn_pinyin.po‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version:circuitpython-cn\n"
88
"Report-Msgid-Bugs-To:\n"
99
"POT-Creation-Date:2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date:2025-05-31 20:05+0000\n"
10+
"PO-Revision-Date:2025-07-15 00:01+0000\n"
1111
"Last-Translator:hexthat <hexthat@gmail.com>\n"
1212
"Language-Team:Chinese Hanyu Pinyin\n"
1313
"Language:zh_Latn_pinyin\n"
1414
"MIME-Version:1.0\n"
1515
"Content-Type:text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding:8bit\n"
1717
"Plural-Forms:nplurals=1; plural=0;\n"
18-
"X-Generator:Weblate 5.12-dev\n"
18+
"X-Generator:Weblate 5.13-dev\n"
1919

2020
#: main.c
2121
msgid""
@@ -870,7 +870,7 @@ msgstr "zuòbiāo shùzǔ lèixíng jùyǒu bùtóng de dàxiǎo"
870870

871871
#: ports/espressif/common-hal/rclcpy/Publisher.c
872872
msgid"Could not publish to ROS topic"
873-
msgstr""
873+
msgstr"wúfǎ fābù dào ROS zhǔtí"
874874

875875
#: shared-bindings/_bleio/Adapter.c
876876
msgid"Could not set address"
@@ -887,7 +887,7 @@ msgstr "wúfǎ fēnpèi jiěmǎ qì"
887887
#: ports/espressif/common-hal/rclcpy/__init__.c
888888
#,c-format
889889
msgid"Critical ROS failure during soft reboot, reset required: %d"
890-
msgstr""
890+
msgstr"ruǎn chóngqǐ qījiān fāshēng guānjiàn de ROS gùzhàng, xūyàozhòngzhì: %d"
891891

892892
#: ports/stm/common-hal/analogio/AnalogOut.c
893893
msgid"DAC Channel Init Error"
@@ -1331,7 +1331,7 @@ msgstr "wú xiào de MAC dì zhǐ"
13311331

13321332
#: ports/espressif/common-hal/rclcpy/__init__.c
13331333
msgid"Invalid ROS domain ID"
1334-
msgstr""
1334+
msgstr"wúxiàode ROS yù ID"
13351335

13361336
#: ports/espressif/common-hal/espidf/__init__.c py/moderrno.c
13371337
msgid"Invalid argument"
@@ -1898,7 +1898,7 @@ msgstr "chéng xù tài cháng"
18981898

18991899
#: shared-bindings/rclcpy/Publisher.c
19001900
msgid"Publishers can only be created from a parent node"
1901-
msgstr""
1901+
msgstr"chūbǎnshāng zhǐ néngcóng fù jiédiǎn chuàngjiàn"
19021902

19031903
#: shared-bindings/digitalio/DigitalInOut.c
19041904
msgid"Pull not used when direction is output."
@@ -1922,23 +1922,23 @@ msgstr "RNG chūshǐhuà cuòwù"
19221922

19231923
#: ports/espressif/common-hal/rclcpy/__init__.c
19241924
msgid"ROS failed to initialize. Is agent connected?"
1925-
msgstr""
1925+
msgstr"ROS chūshǐhuàshībài. dàilǐ yǐ liánjiē ma?"
19261926

19271927
#: ports/espressif/common-hal/rclcpy/__init__.c
19281928
msgid"ROS internal setup failure"
1929-
msgstr""
1929+
msgstr"ROS nèibù shèzhì shībài"
19301930

19311931
#: ports/espressif/common-hal/rclcpy/__init__.c
19321932
msgid"ROS memory allocator failure"
1933-
msgstr""
1933+
msgstr"ROS nèicún fēnpèiqì shībài"
19341934

19351935
#: ports/espressif/common-hal/rclcpy/Node.c
19361936
msgid"ROS node failed to initialize"
1937-
msgstr""
1937+
msgstr"ROS jiédiǎn chūshǐhuà shībài"
19381938

19391939
#: ports/espressif/common-hal/rclcpy/Publisher.c
19401940
msgid"ROS topic failed to initialize"
1941-
msgstr""
1941+
msgstr"ROS zhǔtí chūshǐhuà shībài"
19421942

19431943
#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
19441944
#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c

‎ports/espressif/Makefile‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -571,27 +571,23 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
571571
UF2_BOOTLOADER ?=$(CIRCUITPY_USB_DEVICE)
572572

573573
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
574-
####### No 2MB UF2 boards, so always no OTA, not UF2
574+
# ..... No 2MB UF2 boards, so always no OTA, not UF2
575575
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
576576
else ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 4MB)
577577
ifeq ($(UF2_BOOTLOADER), 1)
578-
############### TODO: For right now, use no-ota only for ESP32-S3. Eventually it will be for ESP32-S2 as well.
579-
ifeq ($(IDF_TARGET),esp32s3)
580-
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
581-
else
582-
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
583-
endif
578+
#............. ESP32-S2 and ESP32-S3 do not have an extra ota partition for OTA update.
579+
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota.defaults
584580
else
585-
############### Non-UF2 4MB: C3, C6, etc.
581+
# ............. Non-UF2 4MB: C3, C6, etc.
586582
ifeq ($(CIRCUITPY_4MB_FLASH_LARGE_USER_FS_LAYOUT), 1)
587-
###################### Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
583+
# .................... Some boards use a 2MB firmware and almost 2MB user filesystem, for historical reasons.
588584
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2-large-user_fs.defaults
589585
else
590586
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
591587
endif
592588
endif
593589
else
594-
####### All the rest are >4MB flash
590+
# ..... All the rest are >4MB flash
595591
ifeq ($(UF2_BOOTLOADER), 1)
596592
FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
597593
else

‎ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ IDF_TARGET = esp32s3
88
CIRCUITPY_ESP_FLASH_MODE = qio
99
CIRCUITPY_ESP_FLASH_FREQ = 80m
1010
CIRCUITPY_ESP_FLASH_SIZE = 8MB
11-
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
10-
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ CIRCUITPY_ESP_FLASH_MODE = qio
99
CIRCUITPY_ESP_FLASH_FREQ = 80m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
1111

12+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
13+
CIRCUITPY_ESP_PSRAM_MODE = qio
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
15+
16+
# Specialized board.
1217
CIRCUITPY_ESPCAMERA = 0
1318
CIRCUITPY_MAX3421E = 0
1419
CIRCUITPY_PS2IO = 0
@@ -21,7 +26,3 @@ CIRCUITPY_FRAMEBUFFERIO = 0
2126

2227
# Include these Python libraries in firmware.
2328
FROZEN_MPY_DIRS +=$(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
24-
25-
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
26-
CIRCUITPY_ESP_PSRAM_MODE = qio
27-
CIRCUITPY_ESP_PSRAM_FREQ = 80m

‎ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ IDF_TARGET = esp32
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
10-
CIRCUITPY_ESPCAMERA = 0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp