Skip to content

Commit 63c1791

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into rp2040-alarms
2 parents f2149ed + c4f685a commit 63c1791

File tree

92 files changed

+1225
-183
lines changed

Some content is hidden

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

92 files changed

+1225
-183
lines changed

‎.github/workflows/build.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,24 @@ jobs:
154154
with:
155155
name: mpy-cross-macos-catalina
156156
path: mpy-cross/mpy-cross
157+
- name: Select SDK for M1 build
158+
run: sudo xcode-select -switch /Applications/Xcode_12.3.app
159+
- name: Build mpy-cross (arm64)
160+
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
161+
- uses: actions/upload-artifact@v2
162+
with:
163+
name: mpy-cross-macos-bigsur-arm64
164+
path: mpy-cross/mpy-cross-arm64
165+
- name: Make universal binary
166+
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
167+
- uses: actions/upload-artifact@v2
168+
with:
169+
name: mpy-cross-macos-universal
170+
path: mpy-cross-macos-universal
157171
- name: Upload mpy-cross build to S3
158172
run: |
173+
[ -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
174+
[ -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
159175
[ -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
160176
env:
161177
AWS_PAGER: ''
@@ -212,6 +228,7 @@ jobs:
212228
- "cp_sapling_m0"
213229
- "cp_sapling_m0_revb"
214230
- "cp_sapling_m0_spiflash"
231+
- "cytron_maker_pi_rp2040"
215232
- "datalore_ip_m4"
216233
- "datum_distance"
217234
- "datum_imu"
@@ -291,6 +308,7 @@ jobs:
291308
- "pewpew_m4"
292309
- "picoplanet"
293310
- "pimoroni_keybow2040"
311+
- "pimoroni_pga2040"
294312
- "pimoroni_picolipo_16mb"
295313
- "pimoroni_picolipo_4mb"
296314
- "pimoroni_picosystem"
@@ -330,6 +348,7 @@ jobs:
330348
- "sparkfun_redboard_turbo"
331349
- "sparkfun_samd21_dev"
332350
- "sparkfun_samd21_mini"
351+
- "sparkfun_samd51_micromod"
333352
- "sparkfun_samd51_thing_plus"
334353
- "sparkfun_thing_plus_rp2040"
335354
- "spresense"
@@ -472,7 +491,8 @@ jobs:
472491
- "franzininho_wifi_wrover"
473492
- "lilygo_ttgo_t8_s2_st7789"
474493
- "microdev_micro_s2"
475-
- "muselab_nanoesp32_s2"
494+
- "muselab_nanoesp32_s2_wroom"
495+
- "muselab_nanoesp32_s2_wrover"
476496
- "targett_module_clip_wroom"
477497
- "targett_module_clip_wrover"
478498
- "unexpectedmaker_feathers2"

‎.github/workflows/ports_windows.yml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: windows port
2+
3+
on:
4+
push:
5+
pull_request:
6+
paths:
7+
- '.github/workflows/*.yml'
8+
- 'tools/**'
9+
- 'py/**'
10+
- 'extmod/**'
11+
- 'lib/**'
12+
- 'ports/unix/**'
13+
- 'ports/windows/**'
14+
15+
jobs:
16+
build:
17+
runs-on: windows-2019
18+
defaults:
19+
run:
20+
# We define a custom shell script here, although `msys2.cmd` does neither exist nor is it available in the PATH yet
21+
shell: msys2 {0}
22+
steps:
23+
24+
# We want to change the configuration of the git command that actions/checkout will be using (since it is not possible to set autocrlf through the action yet, see actions/checkout#226).
25+
- run: git config --global core.autocrlf input
26+
shell: bash
27+
28+
- name: Check python coding (cmd)
29+
run: |
30+
python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
31+
shell: cmd
32+
33+
# We use a JS Action, which calls the system terminal or other custom terminals directly, if required
34+
- uses: msys2/setup-msys2@v2
35+
with:
36+
update: true
37+
install: base-devel git wget unzip gcc python-pip
38+
39+
# The goal of this was to test how things worked when the default file
40+
# encoding (locale.getpreferedencoding()) was not UTF-8. However, msys2
41+
# python does use utf-8 as the preferred file encoding, and using
42+
# actions/setup-python python3.8 gave a broken build, so we're not really
43+
# testing what we wanted to test.
44+
#
45+
# however, commandline length limits are being tested so that does some
46+
# good.
47+
- name: Check python coding (msys2)
48+
run: |
49+
locale -v
50+
which python; python --version
51+
python -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
52+
which python3; python3 --version
53+
python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
54+
55+
- name: Install dependencies
56+
run: |
57+
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-win32.zip
58+
unzip -q -d /tmp gcc-arm.zip
59+
tar -C /tmp/gcc-arm-none-* -cf - . | tar -C /usr/local -xf -
60+
pip install wheel
61+
# requirements_dev.txt doesn't install on windows. (with msys2 python)
62+
# instead, pick a subset for what we want to do
63+
pip install cascadetoml jinja2 typer
64+
# check that installed packages work....?
65+
which python; python --version; python -c "import cascadetoml"
66+
which python3; python3 --version; python3 -c "import cascadetoml"
67+
68+
- uses: actions/checkout@v2
69+
with:
70+
submodules: true
71+
fetch-depth: 0
72+
73+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
74+
- name: CircuitPython version
75+
run: |
76+
git describe --dirty --tags
77+
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
78+
79+
- name: build mpy-cross
80+
run: make -j2 -C mpy-cross
81+
82+
- name: build rp2040
83+
run: make -j2 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
84+
85+
- name: build samd21
86+
run: make -j2 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
87+
88+
- name: build samd51
89+
run: make -j2 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
90+
91+
- name: build nrf
92+
run: make -j2 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
93+
94+
- name: build stm
95+
run: make -j2 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
96+
97+
# I gave up trying to do esp32 builds on windows when I saw
98+
# ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
99+
# https://github.com/espressif/esp-idf/issues/7062
100+
#
101+
# - name: prepare esp
102+
# run: ports/esp32s2/esp-idf/install.bat
103+
# shell: cmd
104+
#
105+
# - name: build esp
106+
# run: . ports/esp32s2/esp-idf/export.sh && make -j2 -C ports/esp32s2 BOARD=adafruit_metro_esp32s2

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,6 @@
184184
[submodule "frozen/Adafruit_CircuitPython_MIDI"]
185185
path = frozen/Adafruit_CircuitPython_MIDI
186186
url = https://github.com/adafruit/Adafruit_CircuitPython_MIDI
187+
[submodule "frozen/Adafruit_CircuitPython_SimpleIO"]
188+
path = frozen/Adafruit_CircuitPython_SimpleIO
189+
url = https://github.com/adafruit/adafruit_circuitpython_simpleio

‎frozen/Adafruit_CircuitPython_DotStar

‎frozen/Adafruit_CircuitPython_ESP32SPI

‎frozen/Adafruit_CircuitPython_HID

‎frozen/Adafruit_CircuitPython_NeoPixel

‎frozen/Adafruit_CircuitPython_ProgressBar

‎frozen/Adafruit_CircuitPython_SimpleIO

‎frozen/Adafruit_CircuitPython_seesaw

0 commit comments

Comments
 (0)