Skip to content

Commit 1f40f9e

Browse files
DavePutzDavePutz
authored
Merge pull request #5 from adafruit/master
update from adafruit
2 parents 7fa5009 + edc5d89 commit 1f40f9e

File tree

119 files changed

+7486
-523
lines changed

Some content is hidden

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

119 files changed

+7486
-523
lines changed

‎.github/workflows/build.yml

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
- name: New boards check
7474
run: python3 -u ci_new_boards_check.py
7575
working-directory: tools
76-
7776
- name: Build mpy-cross.static-raspbian
7877
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
7978
- uses: actions/[email protected]
@@ -137,6 +136,7 @@ jobs:
137136
board:
138137
- "8086_commander"
139138
- "TG-Watch02A"
139+
- "aloriumtech_evo_m51"
140140
- "aramcon_badge_2019"
141141
- "arduino_mkr1300"
142142
- "arduino_mkrzero"
@@ -359,3 +359,86 @@ jobs:
359359
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
360360
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
361361
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
362+
build-xtensa:
363+
runs-on: ubuntu-latest
364+
needs: test
365+
strategy:
366+
fail-fast: false
367+
matrix:
368+
board:
369+
- "espressif_saola_1_wroom"
370+
- "espressif_saola_1_wrover"
371+
372+
steps:
373+
- name: Set up Python 3.8
374+
uses: actions/setup-python@v1
375+
with:
376+
python-version: 3.8
377+
- uses: actions/checkout@v2
378+
with:
379+
submodules: true
380+
fetch-depth: 0
381+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
382+
- run: git submodule sync
383+
- run: git submodule foreach git remote -v
384+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
385+
- name: CircuitPython version
386+
run: git describe --dirty --tags
387+
- uses: actions/cache@v1
388+
name: Fetch IDF tool cache
389+
id: idf-cache
390+
with:
391+
path: ${{ github.workspace }}/.idf_tools
392+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}
393+
- name: Install IDF tools
394+
if: steps.idf-cache.outputs.cache-hit != 'true'
395+
run: |
396+
$IDF_PATH/tools/idf_tools.py --non-interactive install required
397+
$IDF_PATH/tools/idf_tools.py --non-interactive install cmake
398+
$IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
399+
rm -rf $IDF_TOOLS_PATH/dist
400+
env:
401+
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
402+
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
403+
- name: Install CircuitPython deps
404+
run: |
405+
source $IDF_PATH/export.sh
406+
pip install requests sh click setuptools awscli
407+
sudo apt-get install -y gettext ninja-build
408+
env:
409+
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
410+
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
411+
- name: Versions
412+
run: |
413+
source $IDF_PATH/export.sh
414+
gcc --version
415+
xtensa-esp32s2-elf-gcc --version
416+
python3 --version
417+
ninja --version
418+
cmake --version
419+
shell: bash
420+
env:
421+
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
422+
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
423+
- name: mpy-cross
424+
run: make -C mpy-cross -j2
425+
- name: build
426+
run: |
427+
source $IDF_PATH/export.sh
428+
python3 -u build_release_files.py
429+
working-directory: tools
430+
shell: bash
431+
env:
432+
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
433+
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
434+
BOARDS: ${{ matrix.board }}
435+
- uses: actions/[email protected]
436+
with:
437+
name: ${{ matrix.board }}
438+
path: bin/${{ matrix.board }}
439+
- name: Upload to S3
440+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
441+
env:
442+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
443+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
444+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,6 @@
140140
[submodule "frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center"]
141141
path = frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
142142
url = https://github.com/adafruit/Adafruit_CircuitPython_BLE_Apple_Notification_Center
143+
[submodule "ports/esp32s2/esp-idf"]
144+
path = ports/esp32s2/esp-idf
145+
url = https://github.com/tannewt/esp-idf.git

‎conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import os
1919

2020
import recommonmark
21+
import subprocess
2122

2223
# If extensions (or modules to document with autodoc) are in another directory,
2324
# add these directories to sys.path here. If the directory is relative to the
@@ -67,6 +68,7 @@
6768
'.md': 'markdown',
6869
}
6970

71+
subprocess.check_output(["make", "stubs"])
7072
extensions.append('autoapi.extension')
7173

7274
autoapi_type = 'python'
@@ -136,6 +138,8 @@
136138
"ports/atmel-samd/tools",
137139
"ports/cxd56/mkspk",
138140
"ports/cxd56/spresense-exported-sdk",
141+
"ports/esp32s2/esp-idf",
142+
"ports/esp32s2/peripherals",
139143
"ports/litex/hw",
140144
"ports/minimal",
141145
"ports/mimxrt10xx/peripherals",

‎docs/requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
sphinx==1.8.5
2-
recommonmark==0.5.0
1+
sphinx<3
2+
recommonmark==0.6.0
33
sphinxcontrib-svg2pdfconverter==0.1.0
4+
astroid
5+
sphinx-autoapi

‎lib/tinyusb

Submodule tinyusb updated 40 files

‎locale/ID.po

Lines changed: 6 additions & 1 deletion
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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\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"
@@ -1489,6 +1489,11 @@ msgstr ""
14891489
msgid "Tile width must exactly divide bitmap width"
14901490
msgstr ""
14911491

1492+
#: ports/nrf/common-hal/_bleio/Adapter.c
1493+
#, c-format
1494+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1495+
msgstr ""
1496+
14921497
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14931498
msgid "Too many channels in sample."
14941499
msgstr "Terlalu banyak channel dalam sampel"

‎locale/circuitpython.pot

Lines changed: 6 additions & 1 deletion
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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\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"
@@ -1473,6 +1473,11 @@ msgstr ""
14731473
msgid "Tile width must exactly divide bitmap width"
14741474
msgstr ""
14751475

1476+
#: ports/nrf/common-hal/_bleio/Adapter.c
1477+
#, c-format
1478+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1479+
msgstr ""
1480+
14761481
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14771482
msgid "Too many channels in sample."
14781483
msgstr ""

‎locale/cs.po

Lines changed: 6 additions & 1 deletion
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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\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"
@@ -1473,6 +1473,11 @@ msgstr ""
14731473
msgid "Tile width must exactly divide bitmap width"
14741474
msgstr ""
14751475

1476+
#: ports/nrf/common-hal/_bleio/Adapter.c
1477+
#, c-format
1478+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1479+
msgstr ""
1480+
14761481
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14771482
msgid "Too many channels in sample."
14781483
msgstr ""

‎locale/de_DE.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-05-18 02:48+0000\n"
1212
"Last-Translator: Jeff Epler <[email protected]>\n"
1313
"Language-Team: German <https://later.unpythonic.net/projects/circuitpython/"
@@ -1499,6 +1499,11 @@ msgstr ""
14991499
msgid "Tile width must exactly divide bitmap width"
15001500
msgstr ""
15011501

1502+
#: ports/nrf/common-hal/_bleio/Adapter.c
1503+
#, c-format
1504+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1505+
msgstr ""
1506+
15021507
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15031508
msgid "Too many channels in sample."
15041509
msgstr "Zu viele Kanäle im sample"

‎locale/en_US.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1473,6 +1473,11 @@ msgstr ""
14731473
msgid "Tile width must exactly divide bitmap width"
14741474
msgstr ""
14751475

1476+
#: ports/nrf/common-hal/_bleio/Adapter.c
1477+
#, c-format
1478+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1479+
msgstr ""
1480+
14761481
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14771482
msgid "Too many channels in sample."
14781483
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-03-30 22:11+0000\n"
1212
"Last-Translator: Tannewt <[email protected]>\n"
1313
"Language-Team: English <https://later.unpythonic.net/projects/circuitpython/"
@@ -1482,6 +1482,11 @@ msgstr ""
14821482
msgid "Tile width must exactly divide bitmap width"
14831483
msgstr ""
14841484

1485+
#: ports/nrf/common-hal/_bleio/Adapter.c
1486+
#, c-format
1487+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1488+
msgstr ""
1489+
14851490
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14861491
msgid "Too many channels in sample."
14871492
msgstr ""

‎locale/es.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1212
"Last-Translator: Jeff Epler <[email protected]>\n"
1313
"Language-Team: \n"
@@ -1491,6 +1491,11 @@ msgstr ""
14911491
msgid "Tile width must exactly divide bitmap width"
14921492
msgstr "Ancho del Tile debe dividir exactamente el ancho de mapa de bits"
14931493

1494+
#: ports/nrf/common-hal/_bleio/Adapter.c
1495+
#, c-format
1496+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1497+
msgstr ""
1498+
14941499
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14951500
msgid "Too many channels in sample."
14961501
msgstr "Demasiados canales en sample."

‎locale/fil.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <[email protected]>\n"
1313
"Language-Team: fil\n"
@@ -1496,6 +1496,11 @@ msgstr ""
14961496
msgid "Tile width must exactly divide bitmap width"
14971497
msgstr ""
14981498

1499+
#: ports/nrf/common-hal/_bleio/Adapter.c
1500+
#, c-format
1501+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1502+
msgstr ""
1503+
14991504
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15001505
msgid "Too many channels in sample."
15011506
msgstr "Sobra ang channels sa sample."

‎locale/fr.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: 0.1\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1212
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1313
"Last-Translator: Anonymous <[email protected]>\n"
1414
"Language-Team: French <https://later.unpythonic.net/projects/circuitpython/"
@@ -1526,6 +1526,11 @@ msgstr "Valeur de tuile hors limites"
15261526
msgid "Tile width must exactly divide bitmap width"
15271527
msgstr "La largeur de la tuile doit diviser exactement la largeur de l'image"
15281528

1529+
#: ports/nrf/common-hal/_bleio/Adapter.c
1530+
#, c-format
1531+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1532+
msgstr ""
1533+
15291534
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15301535
msgid "Too many channels in sample."
15311536
msgstr "Trop de canaux dans l'échantillon."

‎locale/it_IT.po

Lines changed: 6 additions & 1 deletion
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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <[email protected]>\n"
1414
"Language-Team: \n"
@@ -1507,6 +1507,11 @@ msgstr ""
15071507
msgid "Tile width must exactly divide bitmap width"
15081508
msgstr ""
15091509

1510+
#: ports/nrf/common-hal/_bleio/Adapter.c
1511+
#, c-format
1512+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1513+
msgstr ""
1514+
15101515
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15111516
msgid "Too many channels in sample."
15121517
msgstr ""

‎locale/ko.po

Lines changed: 6 additions & 1 deletion
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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1212
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
1313
"Last-Translator: \n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1477,6 +1477,11 @@ msgstr ""
14771477
msgid "Tile width must exactly divide bitmap width"
14781478
msgstr ""
14791479

1480+
#: ports/nrf/common-hal/_bleio/Adapter.c
1481+
#, c-format
1482+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1483+
msgstr ""
1484+
14801485
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14811486
msgid "Too many channels in sample."
14821487
msgstr ""

0 commit comments

Comments
 (0)