Skip to content

Commit cac4fb0

Browse files
sabas1080sabas1080
authored
Merge branch 'master' into nfc_copy
2 parents 2a47623 + b3b8b5c commit cac4fb0

656 files changed

Lines changed: 27502 additions & 3365 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: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19-
- name: Set up Python 3.5
19+
- name: Set up Python 3.8
2020
uses: actions/setup-python@v1
2121
with:
22-
python-version: 3.5
22+
python-version: 3.8
2323
- name: Install deps
2424
run: |
2525
sudo apt-get install -y eatmydata
2626
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
27-
pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
27+
pip install requests sh click setuptools cpp-coveralls "Sphinx<3" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2828
- name: Versions
2929
run: |
3030
gcc --version
@@ -42,7 +42,7 @@ jobs:
4242
make -C ports/unix -j2
4343
make -C ports/unix coverage -j2
4444
- name: Test all
45-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
45+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
4646
working-directory: tests
4747
- name: Print failure info
4848
run: |
@@ -54,10 +54,10 @@ jobs:
5454
working-directory: tests
5555
if: failure()
5656
- name: Native Tests
57-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
57+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
5858
working-directory: tests
5959
- name: mpy Tests
60-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
60+
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
6161
working-directory: tests
6262
- name: Docs
6363
run: sphinx-build -E -W -b html . _build/html
@@ -122,6 +122,7 @@ jobs:
122122
fail-fast: false
123123
matrix:
124124
board:
125+
- "8086_commander"
125126
- "TG-Watch02A"
126127
- "aramcon_badge_2019"
127128
- "arduino_mkr1300"
@@ -130,6 +131,7 @@ jobs:
130131
- "arduino_nano_33_iot"
131132
- "arduino_zero"
132133
- "bast_pro_mini_m0"
134+
- "bdmicro_vina_m0"
133135
- "capablerobot_usbhub"
134136
- "catwan_usbstick"
135137
- "circuitbrains_basic_m0"
@@ -230,9 +232,11 @@ jobs:
230232
- "stringcar_m0_express"
231233
- "teensy40"
232234
- "teknikio_bluebird"
235+
- "thunderpack"
233236
- "trellis_m4_express"
234237
- "trinket_m0"
235238
- "trinket_m0_haxpress"
239+
- "uartlogger2"
236240
- "uchip"
237241
- "ugame10"
238242
- "winterbloom_big_honking_button"
@@ -241,10 +245,10 @@ jobs:
241245
- "xinabox_cs11"
242246

243247
steps:
244-
- name: Set up Python 3.5
248+
- name: Set up Python 3.8
245249
uses: actions/setup-python@v1
246250
with:
247-
python-version: 3.5
251+
python-version: 3.8
248252
- name: Install deps
249253
run: |
250254
sudo apt-get install -y gettext
@@ -275,4 +279,50 @@ jobs:
275279
env:
276280
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
277281
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
278-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
282+
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
283+
284+
build-riscv:
285+
runs-on: ubuntu-16.04
286+
needs: test
287+
strategy:
288+
fail-fast: false
289+
matrix:
290+
board:
291+
- "fomu"
292+
293+
steps:
294+
- name: Set up Python 3.8
295+
uses: actions/setup-python@v1
296+
with:
297+
python-version: 3.8
298+
- name: Install deps
299+
run: |
300+
sudo apt-get install -y gettext
301+
pip install requests sh click setuptools awscli
302+
wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
303+
sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
304+
- name: Versions
305+
run: |
306+
gcc --version
307+
riscv64-unknown-elf-gcc --version
308+
python3 --version
309+
- uses: actions/checkout@v1
310+
with:
311+
submodules: true
312+
- name: mpy-cross
313+
run: make -C mpy-cross -j2
314+
- name: build
315+
run: python3 -u build_release_files.py
316+
working-directory: tools
317+
env:
318+
BOARDS: ${{ matrix.board }}
319+
- uses: actions/upload-artifact@v1.0.0
320+
with:
321+
name: ${{ matrix.board }}
322+
path: bin/${{ matrix.board }}
323+
- name: Upload to S3
324+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
325+
env:
326+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
327+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
328+
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ 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

‎.gitmodules‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
[submodule "tools/python-semver"]
3030
path = tools/python-semver
3131
url = https://github.com/k-bx/python-semver.git
32-
[submodule "lib/stm32lib"]
33-
path = lib/stm32lib
34-
url = https://github.com/micropython/stm32lib
35-
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
3632
[submodule "atmel-samd/asf4"]
3733
path = ports/atmel-samd/asf4
3834
url = https://github.com/adafruit/asf4.git
@@ -96,9 +92,6 @@
9692
[submodule "frozen/circuitpython-stage"]
9793
path = frozen/circuitpython-stage
9894
url = https://github.com/python-ugame/circuitpython-stage.git
99-
[submodule "ports/stm32f4/stm32f4"]
100-
path = ports/stm32f4/stm32f4
101-
url = https://github.com/adafruit/stm32f4.git
10295
[submodule "ports/cxd56/spresense-exported-sdk"]
10396
path = ports/cxd56/spresense-exported-sdk
10497
url = https://github.com/sonydevworld/spresense-exported-sdk.git
@@ -110,4 +103,19 @@
110103
url = https://github.com/adafruit/Adafruit_MP3
111104
[submodule "ports/mimxrt10xx/sdk"]
112105
path = ports/mimxrt10xx/sdk
113-
url = https://github.com/arturo182/MIMXRT10xx_SDK
106+
url = https://github.com/adafruit/MIMXRT10xx_SDK
107+
[submodule "frozen/Adafruit_CircuitPython_Register"]
108+
path = frozen/Adafruit_CircuitPython_Register
109+
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110+
[submodule "extmod/ulab"]
111+
path = extmod/ulab
112+
url = https://github.com/v923z/micropython-ulab/
113+
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114+
path = frozen/Adafruit_CircuitPython_ESP32SPI
115+
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
116+
[submodule "frozen/Adafruit_CircuitPython_Requests"]
117+
path = frozen/Adafruit_CircuitPython_Requests
118+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
119+
[submodule "ports/stm/st_driver"]
120+
path = ports/stm/st_driver
121+
url = https://github.com/hathach/st_driver.git

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
3636
# the i18n builder cannot share the environment and doctrees with the others
3737
I18NSPHINXOPTS = $(BASEOPTS)
3838

39-
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/nrf py shared-bindings shared-module supervisor
39+
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm py shared-bindings shared-module supervisor
4040

4141
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
4242

‎README.rst‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ Differences from `MicroPython <https://github.com/micropython/micropython>`__
9494

9595
CircuitPython:
9696

97-
- includes ports for MicroChip SAMD21 (Commonly known as M0 in Adafruit
98-
product names) and SAMD51 (M4).
99-
- supports only SAMD21, SAMD51, and nRF52840 ports.
100-
- tracks MicroPython's releases (not master).
101-
- floats (aka decimals) are enabled for all builds.
102-
- error messages are translated into 10+ languages.
103-
- does not support concurrency within Python (including interrupts and threading). Some concurrency
97+
- Supports native USB on all boards, allowing file editing without special tools.
98+
- Supports only SAMD21, SAMD51, nRF52840, CXD56, STM32F4 and i.MX RT ports.
99+
- Tracks MicroPython's releases (not master).
100+
- Floats (aka decimals) are enabled for all builds.
101+
- Error messages are translated into 10+ languages.
102+
- Does not support concurrency within Python (including interrupts and threading). Some concurrency
104103
is achieved with native modules for tasks that require it such as audio file playback.
105104

106105
Behavior

‎conf.py‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,9 @@
121121
"ports/atmel-samd/peripherals",
122122
"ports/atmel-samd/QTouch",
123123
"ports/atmel-samd/tools",
124-
"ports/bare-arm",
125-
"ports/cc3200",
126-
"ports/cc3200/FreeRTOS",
127-
"ports/cc3200/hal",
128124
"ports/cxd56/mkspk",
129125
"ports/cxd56/spresense-exported-sdk",
130-
"ports/esp32",
131-
"ports/esp8266/boards",
132-
"ports/esp8266/common-hal",
133-
"ports/esp8266/modules",
126+
"ports/litex/hw",
134127
"ports/minimal",
135128
"ports/mimxrt10xx/peripherals",
136129
"ports/mimxrt10xx/sdk",
@@ -140,20 +133,10 @@
140133
"ports/nrf/nrfx",
141134
"ports/nrf/peripherals",
142135
"ports/nrf/usb",
143-
"ports/stm32f4/stm32f4",
144-
"ports/stm32f4/peripherals",
145-
"ports/stm32f4/ref",
146-
"ports/pic16bit",
147-
"ports/qemu-arm",
148-
"ports/stm32",
149-
"ports/stm32/hal",
150-
"ports/stm32/cmsis",
151-
"ports/stm32/usbdev",
152-
"ports/stm32/usbhost",
153-
"ports/teensy",
136+
"ports/stm/st_driver",
137+
"ports/stm/peripherals",
138+
"ports/stm/ref",
154139
"ports/unix",
155-
"ports/windows",
156-
"ports/zephyr",
157140
"py",
158141
"shared-bindings/util.*",
159142
"shared-module",

‎docs/design_guide.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ properties.
476476
+-----------------------+-----------------------+-------------------------------------------------------------------------+
477477
| ``distance`` | float | centimeters |
478478
+-----------------------+-----------------------+-------------------------------------------------------------------------+
479+
| ``proximity`` | int | non-unit-specifc proximity values (monotonic but not actual distance) |
480+
+-----------------------+-----------------------+-------------------------------------------------------------------------+
479481
| ``light`` | float | non-unit-specific light levels (should be monotonic but is not lux) |
480482
+-----------------------+-----------------------+-------------------------------------------------------------------------+
481483
| ``lux`` | float | SI lux |
@@ -504,6 +506,8 @@ properties.
504506
+-----------------------+-----------------------+-------------------------------------------------------------------------+
505507
| ``weight`` | float | grams (g) |
506508
+-----------------------+-----------------------+-------------------------------------------------------------------------+
509+
| ``sound_level`` | float | non-unit-specific sound level (monotonic but not actual decibels) |
510+
+-----------------------+-----------------------+-------------------------------------------------------------------------+
507511

508512
Adding native modules
509513
--------------------------------------------------------------------------------

‎docs/supported_ports.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ and ESP8266.
1010
../ports/atmel-samd/README
1111
../ports/mimxrt10xx/README
1212
../ports/nrf/README
13-
../ports/stm32f4/README
13+
../ports/stm/README
1414
../ports/cxd56/README

0 commit comments

Comments
 (0)