Skip to content

Commit b580b34

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into lower_power
2 parents 7dfcae6 + 7ed1483 commit b580b34

127 files changed

Lines changed: 4176 additions & 603 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,29 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19-
- name: Set up Python 3.5
19+
- uses: actions/checkout@v2
20+
with:
21+
submodules: true
22+
fetch-depth: 0
23+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
24+
- run: git submodule sync
25+
- run: git submodule foreach git remote -v
26+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
27+
- name: CircuitPython version
28+
run: git describe --dirty --tags
29+
- name: Set up Python 3.8
2030
uses: actions/setup-python@v1
2131
with:
22-
python-version: 3.5
32+
python-version: 3.8
2333
- name: Install deps
2434
run: |
2535
sudo apt-get install -y eatmydata
2636
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
27-
pip install requests sh click setuptools cpp-coveralls "Sphinx<3" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
37+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2838
- name: Versions
2939
run: |
3040
gcc --version
3141
python3 --version
32-
- uses: actions/checkout@v1
33-
with:
34-
submodules: true
35-
- name: CircuitPython version
36-
run: git describe --dirty --always --tags
3742
- name: Build mpy-cross
3843
run: make -C mpy-cross -j2
3944
- name: Build unix port
@@ -42,7 +47,7 @@ jobs:
4247
make -C ports/unix -j2
4348
make -C ports/unix coverage -j2
4449
- name: Test all
45-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
50+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
4651
working-directory: tests
4752
- name: Print failure info
4853
run: |
@@ -54,10 +59,10 @@ jobs:
5459
working-directory: tests
5560
if: failure()
5661
- name: Native Tests
57-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
62+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
5863
working-directory: tests
5964
- name: mpy Tests
60-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
65+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6166
working-directory: tests
6267
- name: Docs
6368
run: sphinx-build -E -W -b html . _build/html
@@ -103,11 +108,16 @@ jobs:
103108
gcc --version
104109
python3 --version
105110
msgfmt --version
106-
- uses: actions/checkout@v1
111+
- uses: actions/checkout@v2
107112
with:
108113
submodules: true
114+
fetch-depth: 0
115+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
116+
- run: git submodule sync
117+
- run: git submodule foreach git remote -v
118+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
109119
- name: CircuitPython version
110-
run: git describe --dirty --always --tags
120+
run: git describe --dirty --tags
111121
- name: Build mpy-cross
112122
run: make -C mpy-cross -j2
113123
- uses: actions/upload-artifact@v1.0.0
@@ -189,6 +199,7 @@ jobs:
189199
- "mini_sam_m4"
190200
- "monster_m4sk"
191201
- "ndgarage_ndbit6"
202+
- "nfc_copy_cat"
192203
- "ohs2020_badge"
193204
- "openbook_m4"
194205
- "particle_argon"
@@ -244,10 +255,10 @@ jobs:
244255
- "xinabox_cs11"
245256

246257
steps:
247-
- name: Set up Python 3.5
258+
- name: Set up Python 3.8
248259
uses: actions/setup-python@v1
249260
with:
250-
python-version: 3.5
261+
python-version: 3.8
251262
- name: Install deps
252263
run: |
253264
sudo apt-get install -y gettext
@@ -259,9 +270,14 @@ jobs:
259270
gcc --version
260271
arm-none-eabi-gcc --version
261272
python3 --version
262-
- uses: actions/checkout@v1
273+
- uses: actions/checkout@v2
263274
with:
264275
submodules: true
276+
fetch-depth: 0
277+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
278+
- run: git submodule sync
279+
- run: git submodule foreach git remote -v
280+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
265281
- name: mpy-cross
266282
run: make -C mpy-cross -j2
267283
- name: build
@@ -290,10 +306,10 @@ jobs:
290306
- "fomu"
291307

292308
steps:
293-
- name: Set up Python 3.5
309+
- name: Set up Python 3.8
294310
uses: actions/setup-python@v1
295311
with:
296-
python-version: 3.5
312+
python-version: 3.8
297313
- name: Install deps
298314
run: |
299315
sudo apt-get install -y gettext

‎.github/workflows/create_website_pr.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,25 @@ jobs:
1212
env:
1313
GITHUB_CONTEXT: ${{ toJson(github) }}
1414
run: echo "$GITHUB_CONTEXT"
15-
- name: Set up Python 3.5
15+
- name: Set up Python 3.8
1616
uses: actions/setup-python@v1
1717
with:
18-
python-version: 3.5
18+
python-version: 3.8
1919
- name: Install deps
2020
run: |
2121
pip install requests sh click
2222
- name: Versions
2323
run: |
2424
gcc --version
2525
python3 --version
26-
- uses: actions/checkout@v1
26+
- uses: actions/checkout@v2
2727
with:
2828
submodules: true
29+
fetch-depth: 0
30+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
31+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
2932
- name: CircuitPython version
30-
run: git describe --dirty --always --tags
33+
run: git describe --dirty --tags
3134
- name: Website
3235
run: python3 build_board_info.py
3336
working-directory: tools

‎.gitmodules‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110110
[submodule "extmod/ulab"]
111111
path = extmod/ulab
112-
url = https://github.com/v923z/micropython-ulab/
112+
url = https://github.com/v923z/micropython-ulab
113113
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114114
path = frozen/Adafruit_CircuitPython_ESP32SPI
115115
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
@@ -119,3 +119,6 @@
119119
[submodule "ports/stm/st_driver"]
120120
path = ports/stm/st_driver
121121
url = https://github.com/hathach/st_driver.git
122+
[submodule "lib/protomatter"]
123+
path = lib/protomatter
124+
url = https://github.com/adafruit/Adafruit_Protomatter

‎conf.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import sys
1818
import os
1919

20-
from recommonmark.parser import CommonMarkParser
20+
import recommonmark
2121

2222
# If extensions (or modules to document with autodoc) are in another directory,
2323
# add these directories to sys.path here. If the directory is relative to the
@@ -55,16 +55,20 @@
5555
'sphinx.ext.todo',
5656
'sphinx.ext.coverage',
5757
'rstjinja',
58-
'c2rst'
58+
'c2rst',
59+
'recommonmark',
5960
]
6061

6162
# Add any paths that contain templates here, relative to this directory.
6263
templates_path = ['templates']
6364

6465
# The suffix of source filenames.
65-
source_suffix = ['.rst', '.md', '.c', '.h']
66+
source_suffix = {
67+
'.rst': 'restructuredtext',
68+
'.md': 'markdown',
69+
'.c': ''
70+
}
6671

67-
source_parsers = {'.md': CommonMarkParser}
6872

6973
# The encoding of source files.
7074
#source_encoding = 'utf-8-sig'
@@ -357,4 +361,4 @@
357361
"register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None)}
358362

359363
def setup(app):
360-
app.add_stylesheet("customstyle.css")
364+
app.add_css_file("customstyle.css")

‎docs/library/network.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Methods
247247
nic.ifconfig(('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
248248

249249
.. method:: wlan.config('param')
250-
.. method:: wlan.config(param=value, ...)
250+
wlan.config(param=value, ...)
251251

252252
Get or set general network interface parameters. These methods allow to work
253253
with additional parameters beyond standard IP configuration (as dealt with by

‎extmod/ulab‎

‎lib/protomatter‎

Submodule protomatter added at c411714

0 commit comments

Comments
 (0)