Skip to content

Commit 137aa83

Browse files
waiweng83waiweng83
authored
Merge branch 'adafruit:main' into main
2 parents e693974 + 1f57443 commit 137aa83

File tree

409 files changed

+9088
-3196
lines changed

Some content is hidden

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

409 files changed

+9088
-3196
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ jobs:
400400
id: idf-cache
401401
with:
402402
path: ${{ github.workspace }}/.idf_tools
403-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210923
403+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404
404404
- name: Clone IDF submodules
405405
run: |
406406
(cd $IDF_PATH && git submodule update --init)

‎.github/workflows/ports_windows.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ on:
55
pull_request:
66
paths:
77
- '.github/workflows/*.yml'
8-
- 'tools/**'
9-
- 'py/**'
108
- 'extmod/**'
119
- 'lib/**'
10+
- 'mpy-cross/**'
1211
- 'ports/unix/**'
1312
- 'ports/windows/**'
13+
- 'py/**'
14+
- 'requirements*.txt'
15+
- 'tools/**'
1416

1517
concurrency:
1618
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -64,7 +66,7 @@ jobs:
6466
pip install wheel
6567
# requirements_dev.txt doesn't install on windows. (with msys2 python)
6668
# instead, pick a subset for what we want to do
67-
pip install cascadetoml jinja2 typer intelhex
69+
pip install cascadetoml jinja2 typer click intelhex
6870
# check that installed packages work....?
6971
which python; python --version; python -c "import cascadetoml"
7072
which python3; python3 --version; python3 -c "import cascadetoml"

‎.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.

‎docs/library/zlib.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
.. module:: zlib
77
:synopsis: zlib decompression
8+
:noindex:
89

910
|see_cpython_module| :mod:`cpython:zlib`.
1011

@@ -26,6 +27,7 @@ Functions
2627
CPython and is ignored.
2728

2829
.. class:: DecompIO(stream, wbits=0, /)
30+
:noindex:
2931

3032
Create a ``stream`` wrapper which allows transparent decompression of
3133
compressed data in another *stream*. This allows to process compressed

‎lib/tinyusb

Submodule tinyusb updated 195 files

‎lib/uzlib/uzlib.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ typedef struct {
8383
} TINF_TREE;
8484

8585
struct uzlib_uncomp {
86+
/* Point to the CircuitPython object that owns this decompression stream */
87+
void *self;
8688
/* Pointer to the next byte in the input buffer */
8789
const unsigned char *source;
8890
/* Pointer to the next byte past the input buffer (source_limit = source + len) */

‎locale/ID.po

Lines changed: 31 additions & 64 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."
@@ -3053,7 +3054,7 @@ msgstr ""
30533054
msgid "complex values not supported"
30543055
msgstr ""
30553056

3056-
#: extmod/moduzlib.c
3057+
#: extmod/moduzlib.c shared-module/zlib/DecompIO.c
30573058
msgid "compression header"
30583059
msgstr "kompresi header"
30593060

@@ -3160,10 +3161,6 @@ msgstr ""
31603161
msgid "division by zero"
31613162
msgstr ""
31623163

3163-
#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
3164-
msgid "divisor must be 4"
3165-
msgstr ""
3166-
31673164
#: extmod/ulab/code/numpy/vector.c
31683165
msgid "dtype must be float, or complex"
31693166
msgstr ""
@@ -3663,6 +3660,14 @@ msgstr ""
36633660
msgid "loopback + silent mode not supported by peripheral"
36643661
msgstr ""
36653662

3663+
#: ports/espressif/common-hal/mdns/Server.c
3664+
msgid "mDNS already initialized"
3665+
msgstr ""
3666+
3667+
#: ports/espressif/common-hal/mdns/Server.c
3668+
msgid "mDNS only works with built-in WiFi"
3669+
msgstr ""
3670+
36663671
#: py/parse.c
36673672
msgid "malformed f-string"
36683673
msgstr ""
@@ -4094,56 +4099,8 @@ msgstr ""
40944099
msgid "pow() with 3 arguments requires integers"
40954100
msgstr ""
40964101

4097-
#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
4098-
#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
4099-
#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
4100-
#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
4101-
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
4102-
#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
4103-
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
4104-
#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h
4105-
#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
4106-
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
4107-
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
4108-
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
4109-
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
4110-
#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
4111-
#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
4112-
#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h
4113-
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h
4114-
#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h
4115-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h
4116-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h
4117-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h
4118-
#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h
4119-
#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
4120-
#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h
4121-
#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h
4122-
#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h
4123-
#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h
4124-
#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h
4125-
#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h
4126-
#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
4127-
#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
4128-
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
4129-
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
4130-
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
4131-
#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h
4132-
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
4133-
#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
4134-
#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h
4135-
#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
4136-
#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
4137-
#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h
4138-
#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h
4139-
#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h
4140-
#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h
4141-
#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
4142-
#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
4143-
#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h
4144-
#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h
4145-
#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h
4146-
#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h
4102+
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
4103+
#: supervisor/shared/safe_mode.c
41474104
msgid "pressing boot button at start up.\n"
41484105
msgstr ""
41494106

@@ -4697,6 +4654,16 @@ msgstr "zi harus berjenis float"
46974654
msgid "zi must be of shape (n_section, 2)"
46984655
msgstr "Zi harus berbentuk (n_section, 2)"
46994656

4657+
#~ msgid ""
4658+
#~ "\n"
4659+
#~ "Code stopped by auto-reload.\n"
4660+
#~ msgstr ""
4661+
#~ "\n"
4662+
#~ "Kode berhenti oleh auto-reload.\n"
4663+
4664+
#~ msgid "Brightness must be between 0 and 255"
4665+
#~ msgstr "Brightness harus di antara 0 dan 255"
4666+
47004667
#~ msgid "cannot perform relative import"
47014668
#~ msgstr "tidak dapat melakukan relative import"
47024669

0 commit comments

Comments
 (0)