Skip to content

Commit 21ca1b8

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into esp32s2-udp
2 parents d16d27a + 75a977f commit 21ca1b8

File tree

79 files changed

+950
-262
lines changed

Some content is hidden

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

79 files changed

+950
-262
lines changed

‎.github/workflows/build.yml

Lines changed: 8 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 }}
@@ -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,7 +421,7 @@ jobs:
418421
fail-fast: false
419422
matrix:
420423
board:
421-
- "adafruit_esp32s2_eink_portal"
424+
- "adafruit_magtag_2.9_grayscale"
422425
- "adafruit_metro_esp32s2"
423426
- "electroniccats_bastwifi"
424427
- "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: 7 additions & 2 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-21 20:13-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"
@@ -300,6 +300,10 @@ msgstr ""
300300
msgid "All I2C peripherals are in use"
301301
msgstr "Semua perangkat I2C sedang digunakan"
302302

303+
#: ports/esp32s2/peripherals/pcnt_handler.c
304+
msgid "All PCNT units in use"
305+
msgstr ""
306+
303307
#: ports/atmel-samd/common-hal/canio/Listener.c
304308
#: ports/esp32s2/common-hal/canio/Listener.c
305309
#: ports/stm/common-hal/canio/Listener.c
@@ -1130,7 +1134,8 @@ msgid "Invalid phase"
11301134
msgstr "Fase tidak valid"
11311135

11321136
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1133-
#: 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
11341139
#: shared-module/rgbmatrix/RGBMatrix.c
11351140
msgid "Invalid pin"
11361141
msgstr "Pin tidak valid"

‎locale/circuitpython.pot

Lines changed: 7 additions & 2 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-21 20:13-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"
@@ -296,6 +296,10 @@ msgstr ""
296296
msgid "All I2C peripherals are in use"
297297
msgstr ""
298298

299+
#: ports/esp32s2/peripherals/pcnt_handler.c
300+
msgid "All PCNT units in use"
301+
msgstr ""
302+
299303
#: ports/atmel-samd/common-hal/canio/Listener.c
300304
#: ports/esp32s2/common-hal/canio/Listener.c
301305
#: ports/stm/common-hal/canio/Listener.c
@@ -1109,7 +1113,8 @@ msgid "Invalid phase"
11091113
msgstr ""
11101114

11111115
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1112-
#: 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
11131118
#: shared-module/rgbmatrix/RGBMatrix.c
11141119
msgid "Invalid pin"
11151120
msgstr ""

‎locale/cs.po

Lines changed: 7 additions & 2 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-21 20:13-0500\n"
8+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
99
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
1010
"Last-Translator: dronecz <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -300,6 +300,10 @@ msgstr ""
300300
msgid "All I2C peripherals are in use"
301301
msgstr ""
302302

303+
#: ports/esp32s2/peripherals/pcnt_handler.c
304+
msgid "All PCNT units in use"
305+
msgstr ""
306+
303307
#: ports/atmel-samd/common-hal/canio/Listener.c
304308
#: ports/esp32s2/common-hal/canio/Listener.c
305309
#: ports/stm/common-hal/canio/Listener.c
@@ -1113,7 +1117,8 @@ msgid "Invalid phase"
11131117
msgstr ""
11141118

11151119
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1116-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1120+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1121+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11171122
#: shared-module/rgbmatrix/RGBMatrix.c
11181123
msgid "Invalid pin"
11191124
msgstr ""

‎locale/de_DE.po

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
8+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
99
"PO-Revision-Date: 2020-06-16 18:24+0000\n"
1010
"Last-Translator: Andreas Buchen <[email protected]>\n"
1111
"Language: de_DE\n"
@@ -299,6 +299,10 @@ msgstr ""
299299
msgid "All I2C peripherals are in use"
300300
msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
301301

302+
#: ports/esp32s2/peripherals/pcnt_handler.c
303+
msgid "All PCNT units in use"
304+
msgstr ""
305+
302306
#: ports/atmel-samd/common-hal/canio/Listener.c
303307
#: ports/esp32s2/common-hal/canio/Listener.c
304308
#: ports/stm/common-hal/canio/Listener.c
@@ -1130,7 +1134,8 @@ msgid "Invalid phase"
11301134
msgstr "Ungültige Phase"
11311135

11321136
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1133-
#: 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
11341139
#: shared-module/rgbmatrix/RGBMatrix.c
11351140
msgid "Invalid pin"
11361141
msgstr "Ungültiger Pin"

‎locale/el.po

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
10+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -295,6 +295,10 @@ msgstr ""
295295
msgid "All I2C peripherals are in use"
296296
msgstr ""
297297

298+
#: ports/esp32s2/peripherals/pcnt_handler.c
299+
msgid "All PCNT units in use"
300+
msgstr ""
301+
298302
#: ports/atmel-samd/common-hal/canio/Listener.c
299303
#: ports/esp32s2/common-hal/canio/Listener.c
300304
#: ports/stm/common-hal/canio/Listener.c
@@ -1108,7 +1112,8 @@ msgid "Invalid phase"
11081112
msgstr ""
11091113

11101114
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1111-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1115+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1116+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11121117
#: shared-module/rgbmatrix/RGBMatrix.c
11131118
msgid "Invalid pin"
11141119
msgstr ""

‎locale/es.po

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
11-
"PO-Revision-Date: 2020-10-27 21:01+0000\n"
12-
"Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n"
10+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
11+
"PO-Revision-Date: 2020-11-01 16:26+0000\n"
12+
"Last-Translator: Alvaro Figueroa <[email protected]>\n"
1313
"Language-Team: \n"
1414
"Language: es\n"
1515
"MIME-Version: 1.0\n"
@@ -297,12 +297,16 @@ msgstr "Tipo de dirección fuera de rango"
297297

298298
#: ports/esp32s2/common-hal/canio/CAN.c
299299
msgid "All CAN peripherals are in use"
300-
msgstr ""
300+
msgstr "Todos los periféricos CAN están en uso"
301301

302302
#: ports/esp32s2/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
303303
msgid "All I2C peripherals are in use"
304304
msgstr "Todos los periféricos I2C están siendo usados"
305305

306+
#: ports/esp32s2/peripherals/pcnt_handler.c
307+
msgid "All PCNT units in use"
308+
msgstr ""
309+
306310
#: ports/atmel-samd/common-hal/canio/Listener.c
307311
#: ports/esp32s2/common-hal/canio/Listener.c
308312
#: ports/stm/common-hal/canio/Listener.c
@@ -427,7 +431,7 @@ msgstr ""
427431

428432
#: ports/esp32s2/common-hal/canio/CAN.c
429433
msgid "Baudrate not supported by peripheral"
430-
msgstr ""
434+
msgstr "El periférico no maneja el Baudrate"
431435

432436
#: shared-module/displayio/Display.c
433437
#: shared-module/framebufferio/FramebufferDisplay.c
@@ -1131,7 +1135,8 @@ msgid "Invalid phase"
11311135
msgstr "Fase inválida"
11321136

11331137
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1134-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1138+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1139+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11351140
#: shared-module/rgbmatrix/RGBMatrix.c
11361141
msgid "Invalid pin"
11371142
msgstr "Pin inválido"

‎locale/fil.po

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
8+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
99
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1010
"Last-Translator: Timothy <[email protected]>\n"
1111
"Language-Team: fil\n"
@@ -297,6 +297,10 @@ msgstr ""
297297
msgid "All I2C peripherals are in use"
298298
msgstr "Lahat ng I2C peripherals ginagamit"
299299

300+
#: ports/esp32s2/peripherals/pcnt_handler.c
301+
msgid "All PCNT units in use"
302+
msgstr ""
303+
300304
#: ports/atmel-samd/common-hal/canio/Listener.c
301305
#: ports/esp32s2/common-hal/canio/Listener.c
302306
#: ports/stm/common-hal/canio/Listener.c
@@ -1123,7 +1127,8 @@ msgid "Invalid phase"
11231127
msgstr "Mali ang phase"
11241128

11251129
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1126-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1130+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1131+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11271132
#: shared-module/rgbmatrix/RGBMatrix.c
11281133
msgid "Invalid pin"
11291134
msgstr "Mali ang pin"

‎locale/fr.po

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
10+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
1111
"PO-Revision-Date: 2020-10-22 20:48+0000\n"
1212
"Last-Translator: Antonin ENFRUN <[email protected]>\n"
1313
"Language: fr\n"
@@ -304,6 +304,10 @@ msgstr ""
304304
msgid "All I2C peripherals are in use"
305305
msgstr "Tous les périphériques I2C sont utilisés"
306306

307+
#: ports/esp32s2/peripherals/pcnt_handler.c
308+
msgid "All PCNT units in use"
309+
msgstr ""
310+
307311
#: ports/atmel-samd/common-hal/canio/Listener.c
308312
#: ports/esp32s2/common-hal/canio/Listener.c
309313
#: ports/stm/common-hal/canio/Listener.c
@@ -1136,7 +1140,8 @@ msgid "Invalid phase"
11361140
msgstr "Phase invalide"
11371141

11381142
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1139-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1143+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1144+
#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
11401145
#: shared-module/rgbmatrix/RGBMatrix.c
11411146
msgid "Invalid pin"
11421147
msgstr "Broche invalide"

0 commit comments

Comments
 (0)