Skip to content

Commit 4795670

Browse files
microdev1microdev1
committed
Merge branch 'main' into rotaryio-S2
2 parents 80029f6 + 18079c5 commit 4795670

Some content is hidden

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

93 files changed

+2594
-406
lines changed

‎.github/workflows/build.yml

Lines changed: 8 additions & 4 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 }}
@@ -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,6 +421,7 @@ 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"

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

‎locale/ID.po

Lines changed: 47 additions & 4 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-16 19:50-0500\n"
8+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
99
"PO-Revision-Date: 2020-10-10 23:51+0000\n"
1010
"Last-Translator: oon arfiandwi <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -292,11 +292,20 @@ 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

303+
#: ports/esp32s2/peripherals/pcnt_handler.c
304+
msgid "All PCNT units in use"
305+
msgstr ""
306+
299307
#: ports/atmel-samd/common-hal/canio/Listener.c
308+
#: ports/esp32s2/common-hal/canio/Listener.c
300309
#: ports/stm/common-hal/canio/Listener.c
301310
msgid "All RX FIFOs in use"
302311
msgstr ""
@@ -413,6 +422,10 @@ msgstr ""
413422
"Auto-reload aktif. Silahkan simpan data-data (files) melalui USB untuk "
414423
"menjalankannya atau masuk ke REPL untukmenonaktifkan.\n"
415424

425+
#: ports/esp32s2/common-hal/canio/CAN.c
426+
msgid "Baudrate not supported by peripheral"
427+
msgstr ""
428+
416429
#: shared-module/displayio/Display.c
417430
#: shared-module/framebufferio/FramebufferDisplay.c
418431
msgid "Below minimum frame rate"
@@ -793,7 +806,7 @@ msgstr "Mode kendara tidak digunakan saat arah input."
793806
msgid "ECB only operates on 16 bytes at a time"
794807
msgstr "ECB hanya beroperasi pada 16 byte di satu waktu"
795808

796-
#: ports/esp32s2/common-hal/busio/SPI.c
809+
#: ports/esp32s2/common-hal/busio/SPI.c ports/esp32s2/common-hal/canio/CAN.c
797810
msgid "ESP-IDF memory allocation failed"
798811
msgstr ""
799812

@@ -919,6 +932,7 @@ msgid "File exists"
919932
msgstr "File sudah ada"
920933

921934
#: ports/atmel-samd/common-hal/canio/Listener.c
935+
#: ports/esp32s2/common-hal/canio/Listener.c
922936
#: ports/stm/common-hal/canio/Listener.c
923937
msgid "Filters too complex"
924938
msgstr ""
@@ -1120,7 +1134,8 @@ msgid "Invalid phase"
11201134
msgstr "Fase tidak valid"
11211135

11221136
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1123-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1137+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1138+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11241139
#: shared-module/rgbmatrix/RGBMatrix.c
11251140
msgid "Invalid pin"
11261141
msgstr "Pin tidak valid"
@@ -1140,7 +1155,7 @@ msgstr "Pin untuk channel kanan tidak valid"
11401155
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
11411156
#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c
11421157
#: ports/esp32s2/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/SPI.c
1143-
#: ports/esp32s2/common-hal/busio/UART.c
1158+
#: ports/esp32s2/common-hal/busio/UART.c ports/esp32s2/common-hal/canio/CAN.c
11441159
#: ports/mimxrt10xx/common-hal/busio/I2C.c
11451160
#: ports/mimxrt10xx/common-hal/busio/SPI.c
11461161
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
@@ -2884,6 +2899,10 @@ msgstr ""
28842899
msgid "long int not supported in this build"
28852900
msgstr ""
28862901

2902+
#: ports/esp32s2/common-hal/canio/CAN.c
2903+
msgid "loopback + silent mode not supported by peripheral"
2904+
msgstr ""
2905+
28872906
#: py/parse.c
28882907
msgid "malformed f-string"
28892908
msgstr ""
@@ -2918,6 +2937,14 @@ msgstr ""
29182937
msgid "maximum recursion depth exceeded"
29192938
msgstr ""
29202939

2940+
#: extmod/ulab/code/approx/approx.c
2941+
msgid "maxiter must be > 0"
2942+
msgstr ""
2943+
2944+
#: extmod/ulab/code/approx/approx.c
2945+
msgid "maxiter should be > 0"
2946+
msgstr ""
2947+
29212948
#: py/runtime.c
29222949
#, c-format
29232950
msgid "memory allocation failed, allocating %u bytes"
@@ -3229,6 +3256,8 @@ msgstr ""
32293256
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
32303257
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
32313258
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3259+
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
3260+
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
32323261
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
32333262
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
32343263
msgid "pressing boot button at start up.\n"
@@ -3351,6 +3380,10 @@ msgstr "memulai ulang software(soft reboot)\n"
33513380
msgid "sort argument must be an ndarray"
33523381
msgstr ""
33533382

3383+
#: extmod/ulab/code/numerical/numerical.c
3384+
msgid "sorted axis can't be longer than 65535"
3385+
msgstr ""
3386+
33543387
#: extmod/ulab/code/filter/filter.c
33553388
msgid "sos array must be of shape (n_section, 6)"
33563389
msgstr ""
@@ -3481,6 +3514,16 @@ msgstr ""
34813514
msgid "tuple/list has wrong length"
34823515
msgstr ""
34833516

3517+
#: ports/esp32s2/common-hal/canio/CAN.c
3518+
#, c-format
3519+
msgid "twai_driver_install returned esp-idf error #%d"
3520+
msgstr ""
3521+
3522+
#: ports/esp32s2/common-hal/canio/CAN.c
3523+
#, c-format
3524+
msgid "twai_start returned esp-idf error #%d"
3525+
msgstr ""
3526+
34843527
#: ports/atmel-samd/common-hal/busio/UART.c
34853528
#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
34863529
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c

‎locale/circuitpython.pot

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-10-16 19:50-0500\n"
11+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -288,11 +288,20 @@ msgstr ""
288288
msgid "Address type out of range"
289289
msgstr ""
290290

291+
#: ports/esp32s2/common-hal/canio/CAN.c
292+
msgid "All CAN peripherals are in use"
293+
msgstr ""
294+
291295
#: ports/esp32s2/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
292296
msgid "All I2C peripherals are in use"
293297
msgstr ""
294298

299+
#: ports/esp32s2/peripherals/pcnt_handler.c
300+
msgid "All PCNT units in use"
301+
msgstr ""
302+
295303
#: ports/atmel-samd/common-hal/canio/Listener.c
304+
#: ports/esp32s2/common-hal/canio/Listener.c
296305
#: ports/stm/common-hal/canio/Listener.c
297306
msgid "All RX FIFOs in use"
298307
msgstr ""
@@ -407,6 +416,10 @@ msgid ""
407416
"disable.\n"
408417
msgstr ""
409418

419+
#: ports/esp32s2/common-hal/canio/CAN.c
420+
msgid "Baudrate not supported by peripheral"
421+
msgstr ""
422+
410423
#: shared-module/displayio/Display.c
411424
#: shared-module/framebufferio/FramebufferDisplay.c
412425
msgid "Below minimum frame rate"
@@ -775,7 +788,7 @@ msgstr ""
775788
msgid "ECB only operates on 16 bytes at a time"
776789
msgstr ""
777790

778-
#: ports/esp32s2/common-hal/busio/SPI.c
791+
#: ports/esp32s2/common-hal/busio/SPI.c ports/esp32s2/common-hal/canio/CAN.c
779792
msgid "ESP-IDF memory allocation failed"
780793
msgstr ""
781794

@@ -901,6 +914,7 @@ msgid "File exists"
901914
msgstr ""
902915

903916
#: ports/atmel-samd/common-hal/canio/Listener.c
917+
#: ports/esp32s2/common-hal/canio/Listener.c
904918
#: ports/stm/common-hal/canio/Listener.c
905919
msgid "Filters too complex"
906920
msgstr ""
@@ -1099,7 +1113,8 @@ msgid "Invalid phase"
10991113
msgstr ""
11001114

11011115
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1102-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1116+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1117+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11031118
#: shared-module/rgbmatrix/RGBMatrix.c
11041119
msgid "Invalid pin"
11051120
msgstr ""
@@ -1119,7 +1134,7 @@ msgstr ""
11191134
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
11201135
#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c
11211136
#: ports/esp32s2/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/SPI.c
1122-
#: ports/esp32s2/common-hal/busio/UART.c
1137+
#: ports/esp32s2/common-hal/busio/UART.c ports/esp32s2/common-hal/canio/CAN.c
11231138
#: ports/mimxrt10xx/common-hal/busio/I2C.c
11241139
#: ports/mimxrt10xx/common-hal/busio/SPI.c
11251140
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
@@ -2837,6 +2852,10 @@ msgstr ""
28372852
msgid "long int not supported in this build"
28382853
msgstr ""
28392854

2855+
#: ports/esp32s2/common-hal/canio/CAN.c
2856+
msgid "loopback + silent mode not supported by peripheral"
2857+
msgstr ""
2858+
28402859
#: py/parse.c
28412860
msgid "malformed f-string"
28422861
msgstr ""
@@ -3189,6 +3208,8 @@ msgstr ""
31893208
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
31903209
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
31913210
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3211+
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
3212+
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
31923213
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
31933214
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
31943215
msgid "pressing boot button at start up.\n"
@@ -3444,6 +3465,16 @@ msgstr ""
34443465
msgid "tuple/list has wrong length"
34453466
msgstr ""
34463467

3468+
#: ports/esp32s2/common-hal/canio/CAN.c
3469+
#, c-format
3470+
msgid "twai_driver_install returned esp-idf error #%d"
3471+
msgstr ""
3472+
3473+
#: ports/esp32s2/common-hal/canio/CAN.c
3474+
#, c-format
3475+
msgid "twai_start returned esp-idf error #%d"
3476+
msgstr ""
3477+
34473478
#: ports/atmel-samd/common-hal/busio/UART.c
34483479
#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
34493480
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c

0 commit comments

Comments
 (0)