Skip to content

Commit 898f4e1

Browse files
hierophecthierophect
authored
Merge branch 'master' into stm32-meowbit
2 parents 1004099 + 5b6b4eb commit 898f4e1

192 files changed

Lines changed: 7510 additions & 1337 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: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
python-version: 3.5
2323
- name: Install deps
2424
run: |
25-
sudo apt-get install -y gettext librsvg2-bin
25+
sudo apt-get install -y eatmydata
26+
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
2627
pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2728
- name: Versions
2829
run: |
@@ -66,13 +67,62 @@ jobs:
6667
run: python3 -u ci_new_boards_check.py
6768
working-directory: tools
6869

70+
- name: Build mpy-cross.static-raspbian
71+
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
72+
- uses: actions/upload-artifact@v1.0.0
73+
with:
74+
name: mpy-cross.static-raspbian
75+
path: mpy-cross/mpy-cross.static-raspbian
76+
77+
- name: Build mpy-cross.static
78+
run: make -C mpy-cross -j2 -f Makefile.static
79+
- uses: actions/upload-artifact@v1.0.0
80+
with:
81+
name: mpy-cross.static-amd64-linux
82+
path: mpy-cross/mpy-cross.static
83+
84+
- name: Build mpy-cross.static-mingw
85+
run: make -C mpy-cross -j2 -f Makefile.static-mingw
86+
- uses: actions/upload-artifact@v1.0.0
87+
with:
88+
name: mpy-cross.static-x64-windows
89+
path: mpy-cross/mpy-cross.static.exe
90+
91+
mpy-cross-mac:
92+
runs-on: macos-latest
93+
steps:
94+
- name: Dump GitHub context
95+
env:
96+
GITHUB_CONTEXT: ${{ toJson(github) }}
97+
run: echo "$GITHUB_CONTEXT"
98+
- name: Install deps
99+
run: |
100+
brew link --force gettext
101+
- name: Versions
102+
run: |
103+
gcc --version
104+
python3 --version
105+
msgfmt --version
106+
- uses: actions/checkout@v1
107+
with:
108+
submodules: true
109+
- name: CircuitPython version
110+
run: git describe --dirty --always --tags
111+
- name: Build mpy-cross
112+
run: make -C mpy-cross -j2
113+
- uses: actions/upload-artifact@v1.0.0
114+
with:
115+
name: mpy-cross-macos-catalina
116+
path: mpy-cross/mpy-cross
117+
69118
build-arm:
70119
runs-on: ubuntu-16.04
71120
needs: test
72121
strategy:
73122
fail-fast: false
74123
matrix:
75124
board:
125+
- "aramcon_badge_2019"
76126
- "arduino_mkr1300"
77127
- "arduino_mkrzero"
78128
- "arduino_nano_33_ble"
@@ -112,6 +162,8 @@ jobs:
112162
- "hallowing_m0_express"
113163
- "hallowing_m4_express"
114164
- "imxrt1010_evk"
165+
- "imxrt1020_evk"
166+
- "imxrt1060_evk"
115167
- "itsybitsy_m0_express"
116168
- "itsybitsy_m4_express"
117169
- "itsybitsy_nrf52840_express"
@@ -126,6 +178,9 @@ jobs:
126178
- "metro_nrf52840_express"
127179
- "mini_sam_m4"
128180
- "monster_m4sk"
181+
- "ndgarage_ndbit6"
182+
- "ohs2020_badge"
183+
- "openbook_m4"
129184
- "particle_argon"
130185
- "particle_boron"
131186
- "particle_xenon"
@@ -145,6 +200,7 @@ jobs:
145200
- "pyruler"
146201
- "robohatmm1_m4"
147202
- "sam32"
203+
- "seeeduino_xiao"
148204
- "serpente"
149205
- "shirtty"
150206
- "snekboard"
@@ -160,6 +216,7 @@ jobs:
160216
- "stm32f411ve_discovery"
161217
- "stm32f412zg_discovery"
162218
- "stringcar_m0_express"
219+
- "teensy40"
163220
- "teknikio_bluebird"
164221
- "trellis_m4_express"
165222
- "trinket_m0"

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@
110110
url = https://github.com/adafruit/Adafruit_MP3
111111
[submodule "ports/mimxrt10xx/sdk"]
112112
path = ports/mimxrt10xx/sdk
113-
url = https://github.com/arturo182/MIMXRT10xx_SDK
113+
url = https://github.com/adafruit/MIMXRT10xx_SDK

‎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/stm32f4 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

‎docs/shared_bindings_matrix.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def get_excluded_boards(base):
185185
board_is_excluded = True
186186

187187
# check if module is specifically disabled for this board
188-
re_pattern = "CIRCUITPY_{}\s=\s(\w)".format(module.upper())
188+
re_pattern = r"CIRCUITPY_{}\s=\s(\w)".format(module.upper())
189189
find_module = re.search(re_pattern, contents)
190190
if not find_module:
191191
if base[module]["default_value"].isdigit():
@@ -204,9 +204,7 @@ def get_excluded_boards(base):
204204
]):
205205
check_dependent_modules[module] = base[module]["default_value"]
206206
else:
207-
if (find_module.group(1) == "0" and
208-
find_module.group(1) != base[module]["default_value"]):
209-
board_is_excluded = True
207+
board_is_excluded = find_module.group(1) == "0"
210208

211209
if board_is_excluded:
212210
if board_chip in base[module]["excluded"]:

‎lib/tinyusb‎

Submodule tinyusb updated 108 files

0 commit comments

Comments
 (0)