Skip to content

Commit d91ca73

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into revamp-duplicate-usb-check
2 parents a07ac72 + 8ebab76 commit d91ca73

File tree

291 files changed

+6801
-1247
lines changed

Some content is hidden

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

291 files changed

+6801
-1247
lines changed

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@
145145
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
146146
[submodule "ports/espressif/esp-idf"]
147147
path = ports/espressif/esp-idf
148-
url = https://github.com/adafruit/esp-idf.git
149-
branch = circuitpython-v4.4
148+
url = https://github.com/espressif/esp-idf.git
149+
branch = release/v4.4
150150
[submodule "ports/espressif/certificates/nina-fw"]
151151
path = ports/espressif/certificates/nina-fw
152152
url = https://github.com/adafruit/nina-fw.git

‎docs/library/binascii.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,9 @@ Functions
3636
Encode binary data in base64 format, as in `RFC 3548
3737
<https://tools.ietf.org/html/rfc3548.html>`_. Returns the encoded data
3838
followed by a newline character, as a bytes object.
39+
40+
.. function:: crc32(data, value=0, /)
41+
42+
Compute CRC-32, the 32-bit checksum of the bytes in *data* starting with an
43+
initial CRC of *value*. The default initial CRC is 0. The algorithm is
44+
consistent with the ZIP file checksum.

‎lib/tinyusb

Submodule tinyusb updated 195 files

‎locale/ID.po

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ msgstr ""
2727
#: main.c
2828
msgid ""
2929
"\n"
30-
"Code stopped by auto-reload.\n"
30+
"Code stopped by auto-reload. Reloading soon.\n"
3131
msgstr ""
32-
"\n"
33-
"Kode berhenti oleh auto-reload.\n"
3432

3533
#: supervisor/shared/safe_mode.c
3634
msgid ""
@@ -594,10 +592,6 @@ msgstr "Kedua pin harus mendukung hardware interrut"
594592
msgid "Brightness must be 0-1.0"
595593
msgstr "Kecerahan harus di antara 0-1.0"
596594

597-
#: shared-bindings/supervisor/__init__.c
598-
msgid "Brightness must be between 0 and 255"
599-
msgstr "Brightness harus di antara 0 dan 255"
600-
601595
#: shared-bindings/displayio/Display.c
602596
#: shared-bindings/framebufferio/FramebufferDisplay.c
603597
msgid "Brightness not adjustable"
@@ -698,6 +692,7 @@ msgstr ""
698692
msgid "Can only alarm on two low pins from deep sleep."
699693
msgstr ""
700694

695+
#: ports/espressif/common-hal/_bleio/Characteristic.c
701696
#: ports/nrf/common-hal/_bleio/Characteristic.c
702697
msgid "Can't set CCCD on local Characteristic"
703698
msgstr "Tidak dapat mengatur CCCD pada Karakteristik lokal"
@@ -1450,7 +1445,8 @@ msgstr "Pin untuk channel kanan tidak valid"
14501445
#: ports/espressif/common-hal/canio/CAN.c
14511446
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
14521447
#: ports/mimxrt10xx/common-hal/busio/I2C.c
1453-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c
1448+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1449+
#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c
14541450
#: ports/raspberrypi/common-hal/busio/I2C.c
14551451
#: ports/raspberrypi/common-hal/busio/SPI.c
14561452
#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c
@@ -1626,6 +1622,7 @@ msgstr "Nama terlalu panjang"
16261622
msgid "Nimble out of memory"
16271623
msgstr ""
16281624

1625+
#: ports/espressif/common-hal/_bleio/Characteristic.c
16291626
#: ports/nrf/common-hal/_bleio/Characteristic.c
16301627
msgid "No CCCD for this Characteristic"
16311628
msgstr "Tidak ada CCCD untuk Karakteristik ini"
@@ -2193,7 +2190,6 @@ msgstr ""
21932190
msgid "Size not supported"
21942191
msgstr ""
21952192

2196-
#: ports/atmel-samd/common-hal/alarm/SleepMemory.c
21972193
#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
21982194
msgid "Sleep Memory not available"
21992195
msgstr ""
@@ -2445,6 +2441,10 @@ msgstr "Tidak dapat memulai parser"
24452441
msgid "Unable to read color palette data"
24462442
msgstr "Tidak dapat membaca data palet warna"
24472443

2444+
#: ports/espressif/common-hal/mdns/Server.c
2445+
msgid "Unable to start mDNS query"
2446+
msgstr ""
2447+
24482448
#: shared-bindings/nvm/ByteArray.c
24492449
msgid "Unable to write to nvm."
24502450
msgstr "Tidak dapat menulis ke nvm."
@@ -2482,6 +2482,7 @@ msgstr ""
24822482
msgid "Unknown gatt error: 0x%04x"
24832483
msgstr "Kesalahan gatt tidak dikenal: 0x%04x"
24842484

2485+
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
24852486
#: supervisor/shared/safe_mode.c
24862487
msgid "Unknown reason."
24872488
msgstr "Alasan yang tidak diketahui."
@@ -3663,6 +3664,14 @@ msgstr ""
36633664
msgid "loopback + silent mode not supported by peripheral"
36643665
msgstr ""
36653666

3667+
#: ports/espressif/common-hal/mdns/Server.c
3668+
msgid "mDNS already initialized"
3669+
msgstr ""
3670+
3671+
#: ports/espressif/common-hal/mdns/Server.c
3672+
msgid "mDNS only works with built-in WiFi"
3673+
msgstr ""
3674+
36663675
#: py/parse.c
36673676
msgid "malformed f-string"
36683677
msgstr ""
@@ -4103,18 +4112,21 @@ msgstr ""
41034112
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
41044113
#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h
41054114
#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
4115+
#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h
41064116
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
41074117
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
41084118
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
41094119
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
41104120
#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
41114121
#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
41124122
#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h
4123+
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h
41134124
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h
41144125
#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h
41154126
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h
41164127
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h
41174128
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h
4129+
#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h
41184130
#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h
41194131
#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
41204132
#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h
@@ -4126,6 +4138,10 @@ msgstr ""
41264138
#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
41274139
#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
41284140
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
4141+
#: ports/espressif/boards/hexky_s2/mpconfigboard.h
4142+
#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h
4143+
#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h
4144+
#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h
41294145
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
41304146
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
41314147
#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h
@@ -4697,6 +4713,16 @@ msgstr "zi harus berjenis float"
46974713
msgid "zi must be of shape (n_section, 2)"
46984714
msgstr "Zi harus berbentuk (n_section, 2)"
46994715

4716+
#~ msgid ""
4717+
#~ "\n"
4718+
#~ "Code stopped by auto-reload.\n"
4719+
#~ msgstr ""
4720+
#~ "\n"
4721+
#~ "Kode berhenti oleh auto-reload.\n"
4722+
4723+
#~ msgid "Brightness must be between 0 and 255"
4724+
#~ msgstr "Brightness harus di antara 0 dan 255"
4725+
47004726
#~ msgid "cannot perform relative import"
47014727
#~ msgstr "tidak dapat melakukan relative import"
47024728

‎locale/circuitpython.pot

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ msgstr ""
2525
#: main.c
2626
msgid ""
2727
"\n"
28-
"Code stopped by auto-reload.\n"
28+
"Code stopped by auto-reload. Reloading soon.\n"
2929
msgstr ""
3030

3131
#: supervisor/shared/safe_mode.c
@@ -584,10 +584,6 @@ msgstr ""
584584
msgid "Brightness must be 0-1.0"
585585
msgstr ""
586586

587-
#: shared-bindings/supervisor/__init__.c
588-
msgid "Brightness must be between 0 and 255"
589-
msgstr ""
590-
591587
#: shared-bindings/displayio/Display.c
592588
#: shared-bindings/framebufferio/FramebufferDisplay.c
593589
msgid "Brightness not adjustable"
@@ -688,6 +684,7 @@ msgstr ""
688684
msgid "Can only alarm on two low pins from deep sleep."
689685
msgstr ""
690686

687+
#: ports/espressif/common-hal/_bleio/Characteristic.c
691688
#: ports/nrf/common-hal/_bleio/Characteristic.c
692689
msgid "Can't set CCCD on local Characteristic"
693690
msgstr ""
@@ -1429,7 +1426,8 @@ msgstr ""
14291426
#: ports/espressif/common-hal/canio/CAN.c
14301427
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
14311428
#: ports/mimxrt10xx/common-hal/busio/I2C.c
1432-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c
1429+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1430+
#: ports/mimxrt10xx/common-hal/usb_host/Port.c ports/nrf/common-hal/busio/I2C.c
14331431
#: ports/raspberrypi/common-hal/busio/I2C.c
14341432
#: ports/raspberrypi/common-hal/busio/SPI.c
14351433
#: ports/raspberrypi/common-hal/busio/UART.c shared-bindings/busio/SPI.c
@@ -1605,6 +1603,7 @@ msgstr ""
16051603
msgid "Nimble out of memory"
16061604
msgstr ""
16071605

1606+
#: ports/espressif/common-hal/_bleio/Characteristic.c
16081607
#: ports/nrf/common-hal/_bleio/Characteristic.c
16091608
msgid "No CCCD for this Characteristic"
16101609
msgstr ""
@@ -2158,7 +2157,6 @@ msgstr ""
21582157
msgid "Size not supported"
21592158
msgstr ""
21602159

2161-
#: ports/atmel-samd/common-hal/alarm/SleepMemory.c
21622160
#: ports/raspberrypi/common-hal/alarm/SleepMemory.c
21632161
msgid "Sleep Memory not available"
21642162
msgstr ""
@@ -2410,6 +2408,10 @@ msgstr ""
24102408
msgid "Unable to read color palette data"
24112409
msgstr ""
24122410

2411+
#: ports/espressif/common-hal/mdns/Server.c
2412+
msgid "Unable to start mDNS query"
2413+
msgstr ""
2414+
24132415
#: shared-bindings/nvm/ByteArray.c
24142416
msgid "Unable to write to nvm."
24152417
msgstr ""
@@ -2447,6 +2449,7 @@ msgstr ""
24472449
msgid "Unknown gatt error: 0x%04x"
24482450
msgstr ""
24492451

2452+
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
24502453
#: supervisor/shared/safe_mode.c
24512454
msgid "Unknown reason."
24522455
msgstr ""
@@ -3626,6 +3629,14 @@ msgstr ""
36263629
msgid "loopback + silent mode not supported by peripheral"
36273630
msgstr ""
36283631

3632+
#: ports/espressif/common-hal/mdns/Server.c
3633+
msgid "mDNS already initialized"
3634+
msgstr ""
3635+
3636+
#: ports/espressif/common-hal/mdns/Server.c
3637+
msgid "mDNS only works with built-in WiFi"
3638+
msgstr ""
3639+
36293640
#: py/parse.c
36303641
msgid "malformed f-string"
36313642
msgstr ""
@@ -4065,18 +4076,21 @@ msgstr ""
40654076
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
40664077
#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h
40674078
#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
4079+
#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h
40684080
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
40694081
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
40704082
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
40714083
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
40724084
#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
40734085
#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
40744086
#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h
4087+
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h
40754088
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h
40764089
#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h
40774090
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h
40784091
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h
40794092
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h
4093+
#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h
40804094
#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h
40814095
#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
40824096
#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h
@@ -4088,6 +4102,10 @@ msgstr ""
40884102
#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
40894103
#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
40904104
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
4105+
#: ports/espressif/boards/hexky_s2/mpconfigboard.h
4106+
#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h
4107+
#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h
4108+
#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h
40914109
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
40924110
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
40934111
#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h

0 commit comments

Comments
 (0)