Skip to content

Commit d4e8c19

Browse files
committed
merge from main
2 parents d3d5e36 + d659a3b commit d4e8c19

Some content is hidden

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

85 files changed

+1646
-352
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143

144144

145145
mpy-cross-mac:
146-
runs-on: macos-10.15
146+
runs-on: macos-11
147147
steps:
148148
- name: Dump GitHub context
149149
env:
@@ -176,27 +176,25 @@ jobs:
176176
run: make -C mpy-cross -j2
177177
- uses: actions/upload-artifact@v2
178178
with:
179-
name: mpy-cross-macos-catalina
179+
name: mpy-cross-macos-11-x64
180180
path: mpy-cross/mpy-cross
181-
- name: Select SDK for M1 build
182-
run: sudo xcode-select -switch /Applications/Xcode_12.3.app
183181
- name: Build mpy-cross (arm64)
184182
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
185183
- uses: actions/upload-artifact@v2
186184
with:
187-
name: mpy-cross-macos-bigsur-arm64
185+
name: mpy-cross-macos-11-arm64
188186
path: mpy-cross/mpy-cross-arm64
189187
- name: Make universal binary
190188
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
191189
- uses: actions/upload-artifact@v2
192190
with:
193-
name: mpy-cross-macos-universal
191+
name: mpy-cross-macos-11-universal
194192
path: mpy-cross-macos-universal
195193
- name: Upload mpy-cross build to S3
196194
run: |
197-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-universal-${{ env.CP_VERSION }} --no-progress --region us-east-1
198-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-bigsur-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
199-
[ -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
195+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
196+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
197+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
200198
env:
201199
AWS_PAGER: ''
202200
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

docs/environment.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ CIRCUITPY_WEB_API_PASSWORD
3939
~~~~~~~~~~~~~~~~~~~~~~~~~~
4040
Password required to make modifications to the board from the Web Workflow.
4141

42+
CIRCUITPY_WEB_API_PORT
43+
~~~~~~~~~~~~~~~~~~~~~~
44+
TCP port number used for the web HTTP API. Defaults to 80 when omitted.
45+
4246
CIRCUITPY_WIFI_PASSWORD
4347
~~~~~~~~~~~~~~~~~~~~~~~
4448
Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID.

docs/workflows.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Read-only characteristic that returns the UTF-8 encoded version string.
7272
The web workflow is depends on adding Wi-Fi credentials into the `/.env` file. The keys are
7373
`CIRCUITPY_WIFI_SSID` and `CIRCUITPY_WIFI_PASSWORD`. Once these are defined, CircuitPython will
7474
automatically connect to the network and start the webserver used for the workflow. The webserver
75-
is on port 80. It also enables MDNS.
75+
is on port 80 unless overridden by `CIRCUITPY_WEB_API_PORT`. It also enables MDNS.
7676

7777
Here is an example `/.env`:
7878

@@ -82,7 +82,10 @@ CIRCUITPY_WIFI_SSID='scottswifi'
8282
CIRCUITPY_WIFI_PASSWORD='secretpassword'
8383

8484
# To enable modifying files from the web. Change this too!
85+
# Leave the User field blank in the browser.
8586
CIRCUITPY_WEB_API_PASSWORD='passw0rd'
87+
88+
CIRCUITPY_WEB_API_PORT=80
8689
```
8790

8891
MDNS is used to resolve [`circuitpython.local`](http://circuitpython.local) to a device specific
@@ -119,7 +122,7 @@ The web server will allow requests from `cpy-XXXXXX.local`, `127.0.0.1`, the dev
119122
### File REST API
120123
All file system related APIs are protected by HTTP basic authentication. It is *NOT* secure but will
121124
hopefully prevent some griefing in shared settings. The password is sent unencrypted so do not reuse
122-
a password with something important.
125+
a password with something important. The user field is left blank.
123126

124127
The password is taken from `/.env` with the key `CIRCUITPY_WEB_API_PASSWORD`. If this is unset, the
125128
server will respond with `403 Forbidden`. When a password is set, but not provided in a request, it

locale/ID.po

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -971,10 +971,6 @@ msgstr "Gagal terhubung: kesalahan internal"
971971
msgid "Failed to connect: timeout"
972972
msgstr "Gagal terhubung: habis waktu"
973973

974-
#: ports/espressif/common-hal/wifi/__init__.c
975-
msgid "Failed to init wifi"
976-
msgstr ""
977-
978974
#: shared-module/audiomp3/MP3Decoder.c
979975
msgid "Failed to parse MP3 file"
980976
msgstr "Gagal mengurai file MP3"
@@ -1564,7 +1560,7 @@ msgstr "Hanya 8 atau 16 bit mono dengan "
15641560
msgid "Only IPv4 addresses supported"
15651561
msgstr "Hanya alamat IPv4 yang didukung"
15661562

1567-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1563+
#: ports/espressif/common-hal/socketpool/Socket.c
15681564
msgid "Only IPv4 sockets supported"
15691565
msgstr "Hanysa socket IPv4 yang didukung"
15701566

@@ -1636,7 +1632,7 @@ msgstr "Waktu habis"
16361632
msgid "Out of memory"
16371633
msgstr "Kehabisan memori"
16381634

1639-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1635+
#: ports/espressif/common-hal/socketpool/Socket.c
16401636
msgid "Out of sockets"
16411637
msgstr "Kehabisan socket"
16421638

@@ -3791,11 +3787,20 @@ msgstr ""
37913787
msgid "pow() with 3 arguments requires integers"
37923788
msgstr ""
37933789

3790+
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3791+
msgid "pressing BOOT button at start up.\n"
3792+
msgstr ""
3793+
37943794
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
37953795
msgid "pressing SW38 button at start up.\n"
37963796
msgstr ""
37973797

3798+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3799+
msgid "pressing VOLUME button at start up.\n"
3800+
msgstr ""
3801+
37983802
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3803+
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
37993804
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
38003805
#: supervisor/shared/safe_mode.c
38013806
msgid "pressing boot button at start up.\n"

locale/circuitpython.pot

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -958,10 +958,6 @@ msgstr ""
958958
msgid "Failed to connect: timeout"
959959
msgstr ""
960960

961-
#: ports/espressif/common-hal/wifi/__init__.c
962-
msgid "Failed to init wifi"
963-
msgstr ""
964-
965961
#: shared-module/audiomp3/MP3Decoder.c
966962
msgid "Failed to parse MP3 file"
967963
msgstr ""
@@ -1548,7 +1544,7 @@ msgstr ""
15481544
msgid "Only IPv4 addresses supported"
15491545
msgstr ""
15501546

1551-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1547+
#: ports/espressif/common-hal/socketpool/Socket.c
15521548
msgid "Only IPv4 sockets supported"
15531549
msgstr ""
15541550

@@ -1616,7 +1612,7 @@ msgstr ""
16161612
msgid "Out of memory"
16171613
msgstr ""
16181614

1619-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1615+
#: ports/espressif/common-hal/socketpool/Socket.c
16201616
msgid "Out of sockets"
16211617
msgstr ""
16221618

@@ -3759,11 +3755,20 @@ msgstr ""
37593755
msgid "pow() with 3 arguments requires integers"
37603756
msgstr ""
37613757

3758+
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3759+
msgid "pressing BOOT button at start up.\n"
3760+
msgstr ""
3761+
37623762
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
37633763
msgid "pressing SW38 button at start up.\n"
37643764
msgstr ""
37653765

3766+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3767+
msgid "pressing VOLUME button at start up.\n"
3768+
msgstr ""
3769+
37663770
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3771+
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
37673772
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37683773
#: supervisor/shared/safe_mode.c
37693774
msgid "pressing boot button at start up.\n"

locale/cs.po

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,6 @@ msgstr "Připojení se nezdařilo: interní chyba"
969969
msgid "Failed to connect: timeout"
970970
msgstr "Nepodařilo se připojit: časový limit"
971971

972-
#: ports/espressif/common-hal/wifi/__init__.c
973-
msgid "Failed to init wifi"
974-
msgstr "Chyba inicializace WiFi"
975-
976972
#: shared-module/audiomp3/MP3Decoder.c
977973
msgid "Failed to parse MP3 file"
978974
msgstr "Soubor MP3 se nepodařilo analyzovat"
@@ -1564,7 +1560,7 @@ msgstr ""
15641560
msgid "Only IPv4 addresses supported"
15651561
msgstr "Pouze IPv4 adresy podporovány"
15661562

1567-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1563+
#: ports/espressif/common-hal/socketpool/Socket.c
15681564
msgid "Only IPv4 sockets supported"
15691565
msgstr "Pouze IPv4 sokety podporovány"
15701566

@@ -1632,7 +1628,7 @@ msgstr ""
16321628
msgid "Out of memory"
16331629
msgstr ""
16341630

1635-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1631+
#: ports/espressif/common-hal/socketpool/Socket.c
16361632
msgid "Out of sockets"
16371633
msgstr ""
16381634

@@ -3777,11 +3773,20 @@ msgstr ""
37773773
msgid "pow() with 3 arguments requires integers"
37783774
msgstr ""
37793775

3776+
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3777+
msgid "pressing BOOT button at start up.\n"
3778+
msgstr ""
3779+
37803780
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
37813781
msgid "pressing SW38 button at start up.\n"
37823782
msgstr ""
37833783

3784+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3785+
msgid "pressing VOLUME button at start up.\n"
3786+
msgstr ""
3787+
37843788
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3789+
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
37853790
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37863791
#: supervisor/shared/safe_mode.c
37873792
msgid "pressing boot button at start up.\n"
@@ -4333,6 +4338,9 @@ msgstr ""
43334338
msgid "zi must be of shape (n_section, 2)"
43344339
msgstr ""
43354340

4341+
#~ msgid "Failed to init wifi"
4342+
#~ msgstr "Chyba inicializace WiFi"
4343+
43364344
#~ msgid "%q must be a tuple of length 2"
43374345
#~ msgstr "%q musí být n-tice délky 2"
43384346

locale/de_DE.po

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -976,10 +976,6 @@ msgstr "Verbindung fehlgeschlagen: interner Fehler"
976976
msgid "Failed to connect: timeout"
977977
msgstr "Verbindung nicht erfolgreich: timeout"
978978

979-
#: ports/espressif/common-hal/wifi/__init__.c
980-
msgid "Failed to init wifi"
981-
msgstr "Wifi Initialisierung ist fehlgeschlagen"
982-
983979
#: shared-module/audiomp3/MP3Decoder.c
984980
msgid "Failed to parse MP3 file"
985981
msgstr "MP3-Datei konnte nicht analysiert werden"
@@ -1579,7 +1575,7 @@ msgstr "Nur 8 oder 16 bit mono mit "
15791575
msgid "Only IPv4 addresses supported"
15801576
msgstr "Nur IPv4-Adressen werden unterstützt"
15811577

1582-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1578+
#: ports/espressif/common-hal/socketpool/Socket.c
15831579
msgid "Only IPv4 sockets supported"
15841580
msgstr "Nur IPv4-Sockets werden unterstützt"
15851581

@@ -1651,7 +1647,7 @@ msgstr "Zeit für Vorgang abgelaufen"
16511647
msgid "Out of memory"
16521648
msgstr "Kein Speicher mehr verfügbar"
16531649

1654-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1650+
#: ports/espressif/common-hal/socketpool/Socket.c
16551651
msgid "Out of sockets"
16561652
msgstr "Keine Sockets mehr verfügbar"
16571653

@@ -3854,11 +3850,20 @@ msgstr "pow() drittes Argument darf nicht 0 sein"
38543850
msgid "pow() with 3 arguments requires integers"
38553851
msgstr "pow() mit 3 Argumenten erfordert Integer"
38563852

3853+
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3854+
msgid "pressing BOOT button at start up.\n"
3855+
msgstr ""
3856+
38573857
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
38583858
msgid "pressing SW38 button at start up.\n"
38593859
msgstr ""
38603860

3861+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3862+
msgid "pressing VOLUME button at start up.\n"
3863+
msgstr ""
3864+
38613865
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3866+
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
38623867
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
38633868
#: supervisor/shared/safe_mode.c
38643869
msgid "pressing boot button at start up.\n"
@@ -4415,6 +4420,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
44154420
msgid "zi must be of shape (n_section, 2)"
44164421
msgstr "zi muss die Form (n_section, 2) haben"
44174422

4423+
#~ msgid "Failed to init wifi"
4424+
#~ msgstr "Wifi Initialisierung ist fehlgeschlagen"
4425+
44184426
#~ msgid "input must be a tensor of rank 2"
44194427
#~ msgstr "Eingabe muss ein Tensor von Rang 2 sein"
44204428

locale/el.po

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -958,10 +958,6 @@ msgstr ""
958958
msgid "Failed to connect: timeout"
959959
msgstr ""
960960

961-
#: ports/espressif/common-hal/wifi/__init__.c
962-
msgid "Failed to init wifi"
963-
msgstr ""
964-
965961
#: shared-module/audiomp3/MP3Decoder.c
966962
msgid "Failed to parse MP3 file"
967963
msgstr ""
@@ -1548,7 +1544,7 @@ msgstr ""
15481544
msgid "Only IPv4 addresses supported"
15491545
msgstr ""
15501546

1551-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1547+
#: ports/espressif/common-hal/socketpool/Socket.c
15521548
msgid "Only IPv4 sockets supported"
15531549
msgstr ""
15541550

@@ -1616,7 +1612,7 @@ msgstr ""
16161612
msgid "Out of memory"
16171613
msgstr ""
16181614

1619-
#: ports/espressif/common-hal/socketpool/SocketPool.c
1615+
#: ports/espressif/common-hal/socketpool/Socket.c
16201616
msgid "Out of sockets"
16211617
msgstr ""
16221618

@@ -3759,11 +3755,20 @@ msgstr ""
37593755
msgid "pow() with 3 arguments requires integers"
37603756
msgstr ""
37613757

3758+
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3759+
msgid "pressing BOOT button at start up.\n"
3760+
msgstr ""
3761+
37623762
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
37633763
msgid "pressing SW38 button at start up.\n"
37643764
msgstr ""
37653765

3766+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3767+
msgid "pressing VOLUME button at start up.\n"
3768+
msgstr ""
3769+
37663770
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3771+
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
37673772
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37683773
#: supervisor/shared/safe_mode.c
37693774
msgid "pressing boot button at start up.\n"

0 commit comments

Comments
 (0)