Skip to content

Commit 5bb3c32

Browse files
dhalbertdhalbert
committed
merge from main
2 parents 682054a + 8ac9b17 commit 5bb3c32

File tree

35 files changed

+434
-84
lines changed

35 files changed

+434
-84
lines changed

‎.github/workflows/build.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
test:
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-20.04
1818
steps:
1919
- name: Dump GitHub context
2020
env:
@@ -119,6 +119,7 @@ jobs:
119119
zip -9r circuitpython-stubs.zip circuitpython-stubs
120120
[ -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
121121
env:
122+
AWS_PAGER: ''
122123
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
123124
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
124125
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
@@ -159,13 +160,14 @@ jobs:
159160
run: |
160161
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
161162
env:
163+
AWS_PAGER: ''
162164
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
163165
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
164166
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
165167

166168

167169
build-arm:
168-
runs-on: ubuntu-18.04
170+
runs-on: ubuntu-20.04
169171
needs: test
170172
strategy:
171173
fail-fast: false
@@ -363,12 +365,13 @@ jobs:
363365
- name: Upload to S3
364366
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
365367
env:
368+
AWS_PAGER: ''
366369
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
367370
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
368371
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
369372

370373
build-riscv:
371-
runs-on: ubuntu-18.04
374+
runs-on: ubuntu-20.04
372375
needs: test
373376
strategy:
374377
fail-fast: false
@@ -411,11 +414,12 @@ jobs:
411414
- name: Upload to S3
412415
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
413416
env:
417+
AWS_PAGER: ''
414418
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
415419
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
416420
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
417421
build-xtensa:
418-
runs-on: ubuntu-latest
422+
runs-on: ubuntu-20.04
419423
needs: test
420424
strategy:
421425
fail-fast: false
@@ -505,6 +509,7 @@ jobs:
505509
- name: Upload to S3
506510
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
507511
env:
512+
AWS_PAGER: ''
508513
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
509514
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
510515
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

‎.github/workflows/create_website_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
website:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Dump GitHub context
1616
env:

‎.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
pre-commit:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-20.04
1515
steps:
1616
- uses: actions/checkout@v1
1717
- uses: actions/setup-python@v1

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@
152152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
153153
[submodule "ports/esp32s2/esp-idf"]
154154
path = ports/esp32s2/esp-idf
155-
url = https://github.com/espressif/esp-idf.git
155+
url = https://github.com/jepler/esp-idf.git

‎locale/ID.po

Lines changed: 13 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-11-04 21:18+0530\n"
8+
"POT-Creation-Date: 2020-11-10 15:30+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,7 +300,8 @@ msgstr ""
300300
msgid "All I2C peripherals are in use"
301301
msgstr "Semua perangkat I2C sedang digunakan"
302302

303-
#: ports/esp32s2/peripherals/pcnt_handler.c
303+
#: ports/esp32s2/common-hal/countio/Counter.c
304+
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
304305
msgid "All PCNT units in use"
305306
msgstr ""
306307

@@ -1018,6 +1019,10 @@ msgstr ""
10181019
msgid "Incorrect buffer size"
10191020
msgstr "Ukuran penyangga salah"
10201021

1022+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
1023+
msgid "Initialization failed due to lack of memory"
1024+
msgstr ""
1025+
10211026
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
10221027
msgid "Input taking too long"
10231028
msgstr ""
@@ -3254,6 +3259,7 @@ msgstr ""
32543259
msgid "pow() with 3 arguments requires integers"
32553260
msgstr ""
32563261

3262+
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
32573263
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
32583264
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
32593265
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
@@ -3469,6 +3475,7 @@ msgstr ""
34693475
msgid "time.struct_time() takes a 9-sequence"
34703476
msgstr ""
34713477

3478+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
34723479
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
34733480
msgid "timeout duration exceeded the maximum supported value"
34743481
msgstr ""
@@ -3653,6 +3660,10 @@ msgstr ""
36533660
msgid "vectors must have same lengths"
36543661
msgstr ""
36553662

3663+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
3664+
msgid "watchdog not initialized"
3665+
msgstr ""
3666+
36563667
#: shared-bindings/watchdog/WatchDogTimer.c
36573668
msgid "watchdog timeout must be greater than 0"
36583669
msgstr ""

‎locale/circuitpython.pot

Lines changed: 11 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-11-19 00:22-0500\n"
11+
"POT-Creation-Date: 2020-11-19 00:28-0500\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"
@@ -1009,6 +1009,10 @@ msgstr ""
10091009
msgid "Incorrect buffer size"
10101010
msgstr ""
10111011

1012+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
1013+
msgid "Initialization failed due to lack of memory"
1014+
msgstr ""
1015+
10121016
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
10131017
msgid "Input taking too long"
10141018
msgstr ""
@@ -1958,7 +1962,7 @@ msgstr ""
19581962
msgid "WARNING: Your code filename has two extensions\n"
19591963
msgstr ""
19601964

1961-
#: shared-bindings/watchdog/WatchDogTimer.c
1965+
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
19621966
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
19631967
msgstr ""
19641968

@@ -3438,6 +3442,7 @@ msgstr ""
34383442
msgid "time.struct_time() takes a 9-sequence"
34393443
msgstr ""
34403444

3445+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
34413446
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
34423447
msgid "timeout duration exceeded the maximum supported value"
34433448
msgstr ""
@@ -3629,6 +3634,10 @@ msgstr ""
36293634
msgid "wakeup conflict"
36303635
msgstr ""
36313636

3637+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
3638+
msgid "watchdog not initialized"
3639+
msgstr ""
3640+
36323641
#: shared-bindings/watchdog/WatchDogTimer.c
36333642
msgid "watchdog timeout must be greater than 0"
36343643
msgstr ""

‎locale/cs.po

Lines changed: 13 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-11-04 21:18+0530\n"
8+
"POT-Creation-Date: 2020-11-10 15:30+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,7 +300,8 @@ msgstr ""
300300
msgid "All I2C peripherals are in use"
301301
msgstr ""
302302

303-
#: ports/esp32s2/peripherals/pcnt_handler.c
303+
#: ports/esp32s2/common-hal/countio/Counter.c
304+
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
304305
msgid "All PCNT units in use"
305306
msgstr ""
306307

@@ -1001,6 +1002,10 @@ msgstr ""
10011002
msgid "Incorrect buffer size"
10021003
msgstr ""
10031004

1005+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
1006+
msgid "Initialization failed due to lack of memory"
1007+
msgstr ""
1008+
10041009
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
10051010
msgid "Input taking too long"
10061011
msgstr ""
@@ -3210,6 +3215,7 @@ msgstr ""
32103215
msgid "pow() with 3 arguments requires integers"
32113216
msgstr ""
32123217

3218+
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
32133219
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
32143220
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
32153221
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
@@ -3425,6 +3431,7 @@ msgstr ""
34253431
msgid "time.struct_time() takes a 9-sequence"
34263432
msgstr ""
34273433

3434+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
34283435
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
34293436
msgid "timeout duration exceeded the maximum supported value"
34303437
msgstr ""
@@ -3608,6 +3615,10 @@ msgstr ""
36083615
msgid "vectors must have same lengths"
36093616
msgstr ""
36103617

3618+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
3619+
msgid "watchdog not initialized"
3620+
msgstr ""
3621+
36113622
#: shared-bindings/watchdog/WatchDogTimer.c
36123623
msgid "watchdog timeout must be greater than 0"
36133624
msgstr ""

‎locale/de_DE.po

Lines changed: 13 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-11-04 21:18+0530\n"
8+
"POT-Creation-Date: 2020-11-10 15:30+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,7 +299,8 @@ 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
302+
#: ports/esp32s2/common-hal/countio/Counter.c
303+
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
303304
msgid "All PCNT units in use"
304305
msgstr ""
305306

@@ -1018,6 +1019,10 @@ msgstr ""
10181019
msgid "Incorrect buffer size"
10191020
msgstr "Inkorrekte Puffergröße"
10201021

1022+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
1023+
msgid "Initialization failed due to lack of memory"
1024+
msgstr ""
1025+
10211026
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
10221027
msgid "Input taking too long"
10231028
msgstr ""
@@ -3293,6 +3298,7 @@ msgstr "pow() drittes Argument darf nicht 0 sein"
32933298
msgid "pow() with 3 arguments requires integers"
32943299
msgstr "pow () mit 3 Argumenten erfordert Integer"
32953300

3301+
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
32963302
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
32973303
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
32983304
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
@@ -3511,6 +3517,7 @@ msgstr "threshold muss im Intervall 0-65536 liegen"
35113517
msgid "time.struct_time() takes a 9-sequence"
35123518
msgstr "time.struct_time() nimmt eine 9-Sequenz an"
35133519

3520+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
35143521
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
35153522
msgid "timeout duration exceeded the maximum supported value"
35163523
msgstr "Das Zeitlimit hat den maximal zulässigen Wert überschritten"
@@ -3698,6 +3705,10 @@ msgstr "value_count muss größer als 0 sein"
36983705
msgid "vectors must have same lengths"
36993706
msgstr "Vektoren müssen die selbe Länge haben"
37003707

3708+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
3709+
msgid "watchdog not initialized"
3710+
msgstr ""
3711+
37013712
#: shared-bindings/watchdog/WatchDogTimer.c
37023713
msgid "watchdog timeout must be greater than 0"
37033714
msgstr ""

‎locale/el.po

Lines changed: 13 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-11-04 21:18+0530\n"
10+
"POT-Creation-Date: 2020-11-10 15:30+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,7 +295,8 @@ msgstr ""
295295
msgid "All I2C peripherals are in use"
296296
msgstr ""
297297

298-
#: ports/esp32s2/peripherals/pcnt_handler.c
298+
#: ports/esp32s2/common-hal/countio/Counter.c
299+
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
299300
msgid "All PCNT units in use"
300301
msgstr ""
301302

@@ -996,6 +997,10 @@ msgstr ""
996997
msgid "Incorrect buffer size"
997998
msgstr ""
998999

1000+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
1001+
msgid "Initialization failed due to lack of memory"
1002+
msgstr ""
1003+
9991004
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
10001005
msgid "Input taking too long"
10011006
msgstr ""
@@ -3205,6 +3210,7 @@ msgstr ""
32053210
msgid "pow() with 3 arguments requires integers"
32063211
msgstr ""
32073212

3213+
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
32083214
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
32093215
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
32103216
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
@@ -3420,6 +3426,7 @@ msgstr ""
34203426
msgid "time.struct_time() takes a 9-sequence"
34213427
msgstr ""
34223428

3429+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
34233430
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
34243431
msgid "timeout duration exceeded the maximum supported value"
34253432
msgstr ""
@@ -3603,6 +3610,10 @@ msgstr ""
36033610
msgid "vectors must have same lengths"
36043611
msgstr ""
36053612

3613+
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
3614+
msgid "watchdog not initialized"
3615+
msgstr ""
3616+
36063617
#: shared-bindings/watchdog/WatchDogTimer.c
36073618
msgid "watchdog timeout must be greater than 0"
36083619
msgstr ""

0 commit comments

Comments
 (0)