Skip to content

Commit 1f68fff

Browse files
dhalbertdhalbert
committed
merge from main
2 parents 0c26a11 + f603143 commit 1f68fff

134 files changed

Lines changed: 1731 additions & 406 deletions

File tree

Some content is hidden

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

‎.github/actions/upload_aws/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ runs:
2020
steps:
2121
- name: Upload to S3
2222
if: >-
23-
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
24-
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
23+
(github.event_name == 'push' && github.repository_owner == 'adafruit') &&
24+
(github.ref == 'refs/heads/main' ||
25+
(startswith(github.ref, 'refs/heads/') && endswith(github.ref, '.x'))) ||
26+
(github.event_name == 'release' &&
27+
(github.event.action == 'published' || github.event.action == 'rerequested'))
2528
run: >-
2629
[ -z "$AWS_ACCESS_KEY_ID" ] ||
2730
aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }}

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = circuitpython-v5.3
146+
branch = circuitpython-v5.3.1
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/espressif/esp-protocols.git

‎docs/shared_bindings_matrix.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
ADDITIONAL_MODULES = {
6767
"_asyncio": "MICROPY_PY_ASYNCIO",
68+
"_eve": "CIRCUITPY__EVE",
6869
"adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
6970
"adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",
7071
"array": "CIRCUITPY_ARRAY",

‎lib/tinyusb‎

Submodule tinyusb updated 123 files

‎locale/en_GB.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"PO-Revision-Date: 2024-08-10 14:09+0000\n"
10+
"PO-Revision-Date: 2024-08-28 18:09+0000\n"
1111
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
1212
"Language-Team: none\n"
1313
"Language: en_GB\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=2; plural=n != 1;\n"
18-
"X-Generator: Weblate 5.7-dev\n"
18+
"X-Generator: Weblate 5.7.1-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -3553,7 +3553,7 @@ msgstr "name not defined"
35533553

35543554
#: py/qstr.c
35553555
msgid "name too long"
3556-
msgstr ""
3556+
msgstr "name too long"
35573557

35583558
#: py/persistentcode.c
35593559
msgid "native code in .mpy unsupported"

‎locale/zh_Latn_pinyin.po‎

Lines changed: 3 additions & 3 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: 2024-08-19 18:09+0000\n"
10+
"PO-Revision-Date: 2024-09-06 04:09+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.7\n"
18+
"X-Generator: Weblate 5.8-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -3574,7 +3574,7 @@ msgstr "míngchēng wèi dìngyì"
35743574

35753575
#: py/qstr.c
35763576
msgid "name too long"
3577-
msgstr ""
3577+
msgstr "míngchēng tàicháng"
35783578

35793579
#: py/persistentcode.c
35803580
msgid "native code in .mpy unsupported"

‎ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@
3333
// USB is always used internally so skip the pin objects for it.
3434
#define IGNORE_PIN_PA24 1
3535
#define IGNORE_PIN_PA25 1
36+
37+
// Pins not used by pins.c or SPI flash.
38+
#define IGNORE_PIN_PA00 1
39+
#define IGNORE_PIN_PA01 1
40+
#define IGNORE_PIN_PA03 1
41+
#define IGNORE_PIN_PA30 1

‎ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@
2828
#define DEFAULT_UART_BUS_RX (&pin_PB17)
2929
#define DEFAULT_UART_BUS_TX (&pin_PB16)
3030

31+
// Used for 32 kHZ crystal
32+
#define IGNORE_PIN_PA00 1
33+
#define IGNORE_PIN_PA01 1
34+
3135
// USB is always used internally so skip the pin objects for it.
3236
#define IGNORE_PIN_PA24 1
3337
#define IGNORE_PIN_PA25 1
38+
39+
// Not connected
40+
#define IGNORE_PIN_PA15 1
41+
#define IGNORE_PIN_PA27 1
42+
#define IGNORE_PIN_PB00 1
43+
#define IGNORE_PIN_PB04 1
44+
#define IGNORE_PIN_PB06 1
45+
#define IGNORE_PIN_PB07 1
46+
#define IGNORE_PIN_PB30 1
47+
#define IGNORE_PIN_PB31 1

‎ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
99
SPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
12+
13+
CIRCUITPY_RAINBOWIO = 0

‎ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
1212

13-
CIRCUITPY__EVE = 1
13+
CIRCUITPY__EVE = 0
1414
CIRCUITPY_FLOPPYIO = 0
1515
CIRCUITPY_JPEGIO = 0
1616
CIRCUITPY_SYNTHIO = 0

0 commit comments

Comments
 (0)