Skip to content

Commit 2b4d12a

Browse files
DavePutzDavePutz
authored
Merge pull request adafruit#33 from adafruit/main
update from adafruit/main
2 parents 3856da9 + e02539b commit 2b4d12a

109 files changed

Lines changed: 3041 additions & 481 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/workflows/build.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt-get install -y eatmydata
3939
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
40-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli mypy
4141
- name: Versions
4242
run: |
4343
gcc --version
@@ -67,8 +67,8 @@ jobs:
6767
- name: mpy Tests
6868
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6969
working-directory: tests
70-
- name: Stubs
71-
run: make stubs -j2
70+
- name: Build and Validate Stubs
71+
run: make check-stubs -j2
7272
- uses: actions/upload-artifact@v2
7373
with:
7474
name: stubs
@@ -111,11 +111,13 @@ jobs:
111111
with:
112112
name: mpy-cross.static-x64-windows
113113
path: mpy-cross/mpy-cross.static.exe
114-
- name: Upload mpy-cross builds to S3
114+
- name: Upload stubs and mpy-cross builds to S3
115115
run: |
116116
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
117117
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
118118
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
119+
zip -9r circuitpython-stubs.zip circuitpython-stubs
120+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs.zip s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
119121
env:
120122
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
121123
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -131,7 +133,7 @@ jobs:
131133
run: echo "$GITHUB_CONTEXT"
132134
- name: Install dependencies
133135
run: |
134-
brew install gettext awscli
136+
brew install gettext
135137
echo >>$GITHUB_PATH /usr/local/opt/gettext/bin
136138
- name: Versions
137139
run: |
@@ -170,6 +172,7 @@ jobs:
170172
matrix:
171173
board:
172174
- "8086_commander"
175+
- "ADM_B_NRF52840_1"
173176
- "TG-Watch02A"
174177
- "aloriumtech_evo_m51"
175178
- "aramcon_badge_2019"
@@ -418,13 +421,16 @@ jobs:
418421
fail-fast: false
419422
matrix:
420423
board:
424+
- "adafruit_esp32s2_eink_portal"
421425
- "adafruit_metro_esp32s2"
422426
- "electroniccats_bastwifi"
423427
- "espressif_kaluga_1"
424428
- "espressif_saola_1_wroom"
425429
- "espressif_saola_1_wrover"
426430
- "microdev_micro_s2"
427431
- "muselab_nanoesp32_s2"
432+
- "targett_module_clip_wroom"
433+
- "targett_module_clip_wrover"
428434
- "unexpectedmaker_feathers2"
429435
- "unexpectedmaker_feathers2_prerelease"
430436

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
66

77
# Contributing
88
Please note that this project is released with a
9-
[Contributor Code of Conduct](https://github.com/adafruit/circuitpython/blob/main/CODE_OF_CONDUCT.md).
9+
[Contributor Code of Conduct](CODE_OF_CONDUCT.md).
1010
By participating in this project you agree to abide by its terms. Participation
1111
covers any forum used to converse about CircuitPython including unofficial and official spaces. Failure to do
1212
so will result in corrective actions such as time out or ban from the project.

‎README.rst‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Differences from `MicroPython <https://github.com/micropython/micropython>`__
9595
CircuitPython:
9696

9797
- Supports native USB on all boards, allowing file editing without special tools.
98-
- Supports only SAMD21, SAMD51, nRF52840, CXD56, STM32F4 and i.MX RT ports.
9998
- Floats (aka decimals) are enabled for all builds.
10099
- Error messages are translated into 10+ languages.
101100
- Does not support concurrency within Python (including interrupts and threading). Some concurrency
@@ -137,8 +136,8 @@ Behavior
137136
API
138137
~~~
139138

140-
- Unified hardware APIs. Documented
141-
`on ReadTheDocs <https://circuitpython.readthedocs.io/en/latest/shared-bindings/index.html>`_.
139+
- Unified hardware APIs. Documented on
140+
`ReadTheDocs <https://circuitpython.readthedocs.io/en/latest/shared-bindings/index.html>`_.
142141
- API docs are rST within the C files in ``shared-bindings``.
143142
- No ``machine`` API.
144143

@@ -201,14 +200,27 @@ Ports
201200
Ports include the code unique to a microcontroller line and also
202201
variations based on the board.
203202

204-
- ``atmel-samd`` Support for SAMD21 and SAMD51 based boards.
205-
- ``nrf`` Support for the nRF52840 based boards.
206-
- ``unix`` Support for UNIX. Only used for automated testing.
203+
================ ============================================================
204+
Supported Support status
205+
================ ============================================================
206+
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
207+
cxd56 stable
208+
esp32s2 beta
209+
litex alpha
210+
mimxrt10xx alpha
211+
nrf stable
212+
stm ``F4`` stable | ``others`` beta
213+
unix alpha
214+
================ ============================================================
215+
216+
- ``stable`` Highly unlikely to have bugs or missing functionality.
217+
- ``beta`` Being actively improved but may be missing functionality and have bugs.
218+
- ``alpha`` Will have bugs and missing functionality.
207219

208220
The remaining port directories not listed above are in the repo to maintain compatibility with the
209221
`MicroPython <https://github.com/micropython/micropython>`__ parent project.
210222

211-
`back to top <#circuitpython>`__
223+
`Back to Top <#circuitpython>`__
212224

213225
.. |Build Status| image:: https://github.com/adafruit/circuitpython/workflows/Build%20CI/badge.svg
214226
:target: https://github.com/adafruit/circuitpython/actions?query=branch%3Amain

‎extmod/ulab‎

‎locale/ID.po‎

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-10-15 16:06+0530\n"
8+
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
99
"PO-Revision-Date: 2020-10-10 23:51+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -292,11 +292,16 @@ msgstr "Alamat harus sepanjang %d byte"
292292
msgid "Address type out of range"
293293
msgstr "Jenis alamat di luar batas"
294294

295+
#: ports/esp32s2/common-hal/canio/CAN.c
296+
msgid "All CAN peripherals are in use"
297+
msgstr ""
298+
295299
#: ports/esp32s2/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
296300
msgid "All I2C peripherals are in use"
297301
msgstr "Semua perangkat I2C sedang digunakan"
298302

299303
#: ports/atmel-samd/common-hal/canio/Listener.c
304+
#: ports/esp32s2/common-hal/canio/Listener.c
300305
#: ports/stm/common-hal/canio/Listener.c
301306
msgid "All RX FIFOs in use"
302307
msgstr ""
@@ -413,6 +418,10 @@ msgstr ""
413418
"Auto-reload aktif. Silahkan simpan data-data (files) melalui USB untuk "
414419
"menjalankannya atau masuk ke REPL untukmenonaktifkan.\n"
415420

421+
#: ports/esp32s2/common-hal/canio/CAN.c
422+
msgid "Baudrate not supported by peripheral"
423+
msgstr ""
424+
416425
#: shared-module/displayio/Display.c
417426
#: shared-module/framebufferio/FramebufferDisplay.c
418427
msgid "Below minimum frame rate"
@@ -793,7 +802,7 @@ msgstr "Mode kendara tidak digunakan saat arah input."
793802
msgid "ECB only operates on 16 bytes at a time"
794803
msgstr "ECB hanya beroperasi pada 16 byte di satu waktu"
795804

796-
#: ports/esp32s2/common-hal/busio/SPI.c
805+
#: ports/esp32s2/common-hal/busio/SPI.c ports/esp32s2/common-hal/canio/CAN.c
797806
msgid "ESP-IDF memory allocation failed"
798807
msgstr ""
799808

@@ -919,6 +928,7 @@ msgid "File exists"
919928
msgstr "File sudah ada"
920929

921930
#: ports/atmel-samd/common-hal/canio/Listener.c
931+
#: ports/esp32s2/common-hal/canio/Listener.c
922932
#: ports/stm/common-hal/canio/Listener.c
923933
msgid "Filters too complex"
924934
msgstr ""
@@ -1140,7 +1150,7 @@ msgstr "Pin untuk channel kanan tidak valid"
11401150
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
11411151
#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c
11421152
#: ports/esp32s2/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/SPI.c
1143-
#: ports/esp32s2/common-hal/busio/UART.c
1153+
#: ports/esp32s2/common-hal/busio/UART.c ports/esp32s2/common-hal/canio/CAN.c
11441154
#: ports/mimxrt10xx/common-hal/busio/I2C.c
11451155
#: ports/mimxrt10xx/common-hal/busio/SPI.c
11461156
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
@@ -1431,6 +1441,10 @@ msgstr ""
14311441
"Hanya monokrom, 4bpp atau 8bpp yang diindeks, dan 16bpp atau lebih yang "
14321442
"didukung: %d bpp diberikan"
14331443

1444+
#: shared-module/displayio/ColorConverter.c
1445+
msgid "Only one color can be transparent at a time"
1446+
msgstr ""
1447+
14341448
#: shared-bindings/ipaddress/__init__.c
14351449
msgid "Only raw int supported for ip"
14361450
msgstr ""
@@ -2154,6 +2168,10 @@ msgstr ""
21542168
msgid "buffer too small"
21552169
msgstr ""
21562170

2171+
#: shared-bindings/socketpool/Socket.c
2172+
msgid "buffer too small for requested bytes"
2173+
msgstr ""
2174+
21572175
#: shared-bindings/_pew/PewPew.c
21582176
msgid "buttons must be digitalio.DigitalInOut"
21592177
msgstr ""
@@ -2876,6 +2894,10 @@ msgstr ""
28762894
msgid "long int not supported in this build"
28772895
msgstr ""
28782896

2897+
#: ports/esp32s2/common-hal/canio/CAN.c
2898+
msgid "loopback + silent mode not supported by peripheral"
2899+
msgstr ""
2900+
28792901
#: py/parse.c
28802902
msgid "malformed f-string"
28812903
msgstr ""
@@ -2910,6 +2932,14 @@ msgstr ""
29102932
msgid "maximum recursion depth exceeded"
29112933
msgstr ""
29122934

2935+
#: extmod/ulab/code/approx/approx.c
2936+
msgid "maxiter must be > 0"
2937+
msgstr ""
2938+
2939+
#: extmod/ulab/code/approx/approx.c
2940+
msgid "maxiter should be > 0"
2941+
msgstr ""
2942+
29132943
#: py/runtime.c
29142944
#, c-format
29152945
msgid "memory allocation failed, allocating %u bytes"
@@ -3221,6 +3251,8 @@ msgstr ""
32213251
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
32223252
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
32233253
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3254+
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
3255+
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
32243256
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
32253257
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
32263258
msgid "pressing boot button at start up.\n"
@@ -3343,6 +3375,10 @@ msgstr "memulai ulang software(soft reboot)\n"
33433375
msgid "sort argument must be an ndarray"
33443376
msgstr ""
33453377

3378+
#: extmod/ulab/code/numerical/numerical.c
3379+
msgid "sorted axis can't be longer than 65535"
3380+
msgstr ""
3381+
33463382
#: extmod/ulab/code/filter/filter.c
33473383
msgid "sos array must be of shape (n_section, 6)"
33483384
msgstr ""
@@ -3473,6 +3509,16 @@ msgstr ""
34733509
msgid "tuple/list has wrong length"
34743510
msgstr ""
34753511

3512+
#: ports/esp32s2/common-hal/canio/CAN.c
3513+
#, c-format
3514+
msgid "twai_driver_install returned esp-idf error #%d"
3515+
msgstr ""
3516+
3517+
#: ports/esp32s2/common-hal/canio/CAN.c
3518+
#, c-format
3519+
msgid "twai_start returned esp-idf error #%d"
3520+
msgstr ""
3521+
34763522
#: ports/atmel-samd/common-hal/busio/UART.c
34773523
#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
34783524
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c

0 commit comments

Comments
 (0)