Skip to content

Commit df13d86

Browse files
bill88tbill88t
committed
Merge remote-tracking branch 'adafruit/main' into rpi-auto-disconnect
2 parents ed4c510 + aa0d7aa commit df13d86

File tree

559 files changed

+8057
-9131
lines changed

Some content is hidden

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

559 files changed

+8057
-9131
lines changed

‎.devcontainer/cortex-m/on-create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ rm -fr /workspaces/dosfstools-4.2 /workspaces/dosfstools-4.2.tar.gz
3434
# prepare source-code tree
3535
cd /workspaces/circuitpython/
3636
echo -e "[on-create.sh] fetching submodules"
37-
make fetch-submodules
37+
make fetch-all-submodules
3838
echo -e "[on-create.sh] fetching tags"
3939
git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD
4040

‎.github/actions/deps/external/action.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ runs:
3737
- name: Install IDF tools
3838
if: inputs.port == 'espressif'
3939
run: |
40-
echo "Installing ESP-IDF tools"
41-
$IDF_PATH/tools/idf_tools.py --non-interactive install required
42-
$IDF_PATH/tools/idf_tools.py --non-interactive install cmake
43-
echo "Installing Python environment and packages"
44-
$IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
40+
$IDF_PATH/install.sh
4541
rm -rf $IDF_TOOLS_PATH/dist
4642
shell: bash
4743
- name: Set environment

‎.gitmodules

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,14 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = release/v4.4-circuitpython
147-
[submodule "ports/espressif/certificates/nina-fw"]
148-
path = lib/certificates/nina-fw
149-
url = https://github.com/adafruit/nina-fw.git
146+
branch = circuitpython-v5.1
147+
[submodule "ports/espressif/esp-protocols"]
148+
path = ports/espressif/esp-protocols
149+
url = https://github.com/espressif/esp-protocols.git
150+
[submodule "ports/espressif/esp-camera"]
151+
path = ports/espressif/esp-camera
152+
url = https://github.com/adafruit/esp32-camera.git
153+
branch = circuitpython
150154
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
151155
path = frozen/Adafruit_CircuitPython_ST7789
152156
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
@@ -300,10 +304,6 @@
300304
[submodule "frozen/circuitpython_picoed"]
301305
path = frozen/circuitpython_picoed
302306
url = https://github.com/elecfreaks/circuitpython_picoed.git
303-
[submodule "ports/espressif/esp32-camera"]
304-
path = ports/espressif/esp32-camera
305-
url = https://github.com/adafruit/esp32-camera/
306-
branch = circuitpython
307307
[submodule "ports/raspberrypi/lib/cyw43-driver"]
308308
path = ports/raspberrypi/lib/cyw43-driver
309309
url = https://github.com/georgerobotics/cyw43-driver.git
@@ -340,8 +340,11 @@
340340
url = https://github.com/bablokb/circuitpython-pcf85063a
341341
[submodule "frozen/Adafruit_CircuitPython_Wave"]
342342
path = frozen/Adafruit_CircuitPython_Wave
343-
url = http://github.com/adafruit/Adafruit_CircuitPython_Wave.git
343+
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
344344
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
345345
path = ports/raspberrypi/lib/Pico-PIO-USB
346346
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
347347
branch = main
348+
[submodule "lib/certificates"]
349+
path = lib/certificates
350+
url = https://github.com/adafruit/certificates

‎lib/certificates

Submodule certificates added at cbb33c1

‎lib/certificates/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎lib/certificates/nina-fw

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/protomatter

‎locale/ID.po

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@ msgstr ""
9292
"%d pin alamat, %d rgb pin dan %d ubin menunjukkan ketinggian %d, bukan %d"
9393

9494
#: ports/atmel-samd/common-hal/alarm/__init__.c
95+
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
9596
#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
97+
#: ports/espressif/common-hal/audiobusio/I2SOut.c
9698
#: ports/espressif/common-hal/rtc/RTC.c
9799
#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
98100
#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
99-
#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
101+
#: ports/nrf/common-hal/analogio/AnalogOut.c
102+
#: ports/nrf/common-hal/audiobusio/I2SOut.c ports/nrf/common-hal/rtc/RTC.c
100103
#: ports/raspberrypi/common-hal/alarm/__init__.c
101104
#: ports/raspberrypi/common-hal/analogio/AnalogOut.c
105+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
102106
#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
103107
#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
104108
#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
@@ -446,10 +450,6 @@ msgstr "pow() 3-arg tidak didukung"
446450
msgid "A hardware interrupt channel is already in use"
447451
msgstr "Sebuah channel hardware interrupt sedang digunakan"
448452

449-
#: ports/espressif/common-hal/analogio/AnalogIn.c
450-
msgid "ADC2 is being used by WiFi"
451-
msgstr "ADC2 sedang digunakan oleh WiFi"
452-
453453
#: ports/raspberrypi/common-hal/wifi/Radio.c
454454
msgid "AP could not be started"
455455
msgstr ""
@@ -461,9 +461,14 @@ msgstr "Alamat harus sepanjang %d byte"
461461

462462
#: ports/espressif/common-hal/memorymap/AddressRange.c
463463
#: ports/nrf/common-hal/memorymap/AddressRange.c
464+
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
464465
msgid "Address range not allowed"
465466
msgstr ""
466467

468+
#: shared-bindings/memorymap/AddressRange.c
469+
msgid "Address range wraps around"
470+
msgstr ""
471+
467472
#: ports/espressif/common-hal/canio/CAN.c
468473
msgid "All CAN peripherals are in use"
469474
msgstr ""
@@ -1234,6 +1239,7 @@ msgid "Invalid %q"
12341239
msgstr ""
12351240

12361241
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
1242+
#: ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
12371243
#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
12381244
#: shared-bindings/microcontroller/Pin.c
12391245
msgid "Invalid %q pin"
@@ -1388,6 +1394,10 @@ msgstr ""
13881394
msgid "Must be a %q subclass."
13891395
msgstr "Harus berupa subclass %q."
13901396

1397+
#: ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
1398+
msgid "Must provide 5/6/5 RGB pins"
1399+
msgstr ""
1400+
13911401
#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
13921402
msgid "Must provide MISO or MOSI pin"
13931403
msgstr "Harus menyediakan pin MISO atau MOSI"
@@ -2151,6 +2161,10 @@ msgstr "String UUID bukan 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
21512161
msgid "UUID value is not str, int or byte buffer"
21522162
msgstr "Nilai UUID bukan str, int atau byte buffer"
21532163

2164+
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
2165+
msgid "Unable to access unaligned IO register"
2166+
msgstr ""
2167+
21542168
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21552169
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
21562170
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
@@ -2162,11 +2176,6 @@ msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
21622176
msgid "Unable to allocate the heap."
21632177
msgstr ""
21642178

2165-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
2166-
#, c-format
2167-
msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
2168-
msgstr ""
2169-
21702179
#: ports/espressif/common-hal/busio/I2C.c
21712180
msgid "Unable to create lock"
21722181
msgstr ""
@@ -2185,33 +2194,23 @@ msgstr "Tidak dapat menemukan GCLK yang kosong"
21852194
msgid "Unable to init parser"
21862195
msgstr "Tidak dapat memulai parser"
21872196

2188-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
2189-
#, c-format
2190-
msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
2191-
msgstr ""
2192-
21932197
#: shared-module/displayio/OnDiskBitmap.c
21942198
msgid "Unable to read color palette data"
21952199
msgstr "Tidak dapat membaca data palet warna"
21962200

2197-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
2198-
#, c-format
2199-
msgid "Unable to start ADC DMA controller, ErrorCode:%d"
2200-
msgstr ""
2201-
22022201
#: ports/espressif/common-hal/mdns/Server.c
22032202
#: ports/raspberrypi/common-hal/mdns/Server.c
22042203
msgid "Unable to start mDNS query"
22052204
msgstr ""
22062205

2207-
#: shared-bindings/memorymap/AddressRange.c
2208-
msgid "Unable to write to address."
2209-
msgstr ""
2210-
22112206
#: shared-bindings/nvm/ByteArray.c
22122207
msgid "Unable to write to nvm."
22132208
msgstr "Tidak dapat menulis ke nvm."
22142209

2210+
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
2211+
msgid "Unable to write to read-only memory"
2212+
msgstr ""
2213+
22152214
#: shared-bindings/alarm/SleepMemory.c
22162215
msgid "Unable to write to sleep_memory."
22172216
msgstr ""
@@ -2974,7 +2973,7 @@ msgstr ""
29742973
msgid "empty file"
29752974
msgstr ""
29762975

2977-
#: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
2976+
#: extmod/moduasyncio.c extmod/moduheapq.c
29782977
msgid "empty heap"
29792978
msgstr "heap kosong"
29802979

@@ -3926,10 +3925,6 @@ msgstr ""
39263925
msgid "pull masks conflict with direction masks"
39273926
msgstr ""
39283927

3929-
#: extmod/modutimeq.c
3930-
msgid "queue overflow"
3931-
msgstr "antrian meluap (overflow)"
3932-
39333928
#: py/parse.c
39343929
msgid "raw f-strings are not supported"
39353930
msgstr ""
@@ -4220,7 +4215,8 @@ msgstr ""
42204215
msgid "unexpected keyword argument"
42214216
msgstr "argumen keyword tidak diharapkan"
42224217

4223-
#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
4218+
#: py/argcheck.c py/bc.c py/objnamedtuple.c
4219+
#: shared-bindings/traceback/__init__.c
42244220
msgid "unexpected keyword argument '%q'"
42254221
msgstr "keyword argumen '%q' tidak diharapkan"
42264222

@@ -4377,10 +4373,6 @@ msgstr "jumlah nilai yang salah untuk dibongkar"
43774373
msgid "wrong output type"
43784374
msgstr "tipe output salah"
43794375

4380-
#: ports/espressif/common-hal/audiobusio/__init__.c
4381-
msgid "xTaskCreate failed"
4382-
msgstr "xTaskCreate gagal"
4383-
43844376
#: extmod/ulab/code/scipy/signal/signal.c
43854377
msgid "zi must be an ndarray"
43864378
msgstr "zi harus ndarray"
@@ -4393,6 +4385,15 @@ msgstr "zi harus berjenis float"
43934385
msgid "zi must be of shape (n_section, 2)"
43944386
msgstr "Zi harus berbentuk (n_section, 2)"
43954387

4388+
#~ msgid "ADC2 is being used by WiFi"
4389+
#~ msgstr "ADC2 sedang digunakan oleh WiFi"
4390+
4391+
#~ msgid "xTaskCreate failed"
4392+
#~ msgstr "xTaskCreate gagal"
4393+
4394+
#~ msgid "queue overflow"
4395+
#~ msgstr "antrian meluap (overflow)"
4396+
43964397
#~ msgid "Buffer is too small"
43974398
#~ msgstr "Buffer terlalu kecil"
43984399

‎locale/circuitpython.pot

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,6 @@ msgstr ""
447447
msgid "A hardware interrupt channel is already in use"
448448
msgstr ""
449449

450-
#: ports/espressif/common-hal/analogio/AnalogIn.c
451-
msgid "ADC2 is being used by WiFi"
452-
msgstr ""
453-
454450
#: ports/raspberrypi/common-hal/wifi/Radio.c
455451
msgid "AP could not be started"
456452
msgstr ""
@@ -462,9 +458,14 @@ msgstr ""
462458

463459
#: ports/espressif/common-hal/memorymap/AddressRange.c
464460
#: ports/nrf/common-hal/memorymap/AddressRange.c
461+
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
465462
msgid "Address range not allowed"
466463
msgstr ""
467464

465+
#: shared-bindings/memorymap/AddressRange.c
466+
msgid "Address range wraps around"
467+
msgstr ""
468+
468469
#: ports/espressif/common-hal/canio/CAN.c
469470
msgid "All CAN peripherals are in use"
470471
msgstr ""
@@ -1228,6 +1229,7 @@ msgid "Invalid %q"
12281229
msgstr ""
12291230

12301231
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
1232+
#: ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
12311233
#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
12321234
#: shared-bindings/microcontroller/Pin.c
12331235
msgid "Invalid %q pin"
@@ -1382,6 +1384,10 @@ msgstr ""
13821384
msgid "Must be a %q subclass."
13831385
msgstr ""
13841386

1387+
#: ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
1388+
msgid "Must provide 5/6/5 RGB pins"
1389+
msgstr ""
1390+
13851391
#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
13861392
msgid "Must provide MISO or MOSI pin"
13871393
msgstr ""
@@ -2131,6 +2137,10 @@ msgstr ""
21312137
msgid "UUID value is not str, int or byte buffer"
21322138
msgstr ""
21332139

2140+
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
2141+
msgid "Unable to access unaligned IO register"
2142+
msgstr ""
2143+
21342144
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21352145
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
21362146
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
@@ -2142,11 +2152,6 @@ msgstr ""
21422152
msgid "Unable to allocate the heap."
21432153
msgstr ""
21442154

2145-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
2146-
#, c-format
2147-
msgid "Unable to configure ADC DMA controller, ErrorCode:%d"
2148-
msgstr ""
2149-
21502155
#: ports/espressif/common-hal/busio/I2C.c
21512156
msgid "Unable to create lock"
21522157
msgstr ""
@@ -2165,33 +2170,23 @@ msgstr ""
21652170
msgid "Unable to init parser"
21662171
msgstr ""
21672172

2168-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
2169-
#, c-format
2170-
msgid "Unable to initialize ADC DMA controller, ErrorCode:%d"
2171-
msgstr ""
2172-
21732173
#: shared-module/displayio/OnDiskBitmap.c
21742174
msgid "Unable to read color palette data"
21752175
msgstr ""
21762176

2177-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
2178-
#, c-format
2179-
msgid "Unable to start ADC DMA controller, ErrorCode:%d"
2180-
msgstr ""
2181-
21822177
#: ports/espressif/common-hal/mdns/Server.c
21832178
#: ports/raspberrypi/common-hal/mdns/Server.c
21842179
msgid "Unable to start mDNS query"
21852180
msgstr ""
21862181

2187-
#: shared-bindings/memorymap/AddressRange.c
2188-
msgid "Unable to write to address."
2189-
msgstr ""
2190-
21912182
#: shared-bindings/nvm/ByteArray.c
21922183
msgid "Unable to write to nvm."
21932184
msgstr ""
21942185

2186+
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
2187+
msgid "Unable to write to read-only memory"
2188+
msgstr ""
2189+
21952190
#: shared-bindings/alarm/SleepMemory.c
21962191
msgid "Unable to write to sleep_memory."
21972192
msgstr ""
@@ -4193,7 +4188,8 @@ msgstr ""
41934188
msgid "unexpected keyword argument"
41944189
msgstr ""
41954190

4196-
#: py/bc.c py/objnamedtuple.c shared-bindings/traceback/__init__.c
4191+
#: py/argcheck.c py/bc.c py/objnamedtuple.c
4192+
#: shared-bindings/traceback/__init__.c
41974193
msgid "unexpected keyword argument '%q'"
41984194
msgstr ""
41994195

@@ -4350,10 +4346,6 @@ msgstr ""
43504346
msgid "wrong output type"
43514347
msgstr ""
43524348

4353-
#: ports/espressif/common-hal/audiobusio/__init__.c
4354-
msgid "xTaskCreate failed"
4355-
msgstr ""
4356-
43574349
#: extmod/ulab/code/scipy/signal/signal.c
43584350
msgid "zi must be an ndarray"
43594351
msgstr ""

0 commit comments

Comments
 (0)