Skip to content

Commit 40434d6

Browse files
dhalbertdhalbert
committed
wip
2 parents 1505da7 + 15886b1 commit 40434d6

306 files changed

Lines changed: 11393 additions & 5169 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: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Build CI
22

3-
on: [push, pull_request, release]
3+
on:
4+
push:
5+
pull_request:
6+
release:
7+
types: [published]
8+
check_suite:
9+
types: [rerequested]
410

511
jobs:
612
test:
@@ -10,9 +16,6 @@ jobs:
1016
env:
1117
GITHUB_CONTEXT: ${{ toJson(github) }}
1218
run: echo "$GITHUB_CONTEXT"
13-
- name: Fail if not a release publish # workaround has `on` doesn't have this filter
14-
run: exit 1
15-
if: github.event_name == 'release' && (github.event.action != 'published' && github.event.action != 'rerequested')
1619
- name: Set up Python 3.5
1720
uses: actions/setup-python@v1
1821
with:
@@ -49,9 +52,6 @@ jobs:
4952
done
5053
working-directory: tests
5154
if: failure()
52-
- name: Test threads
53-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread
54-
working-directory: tests
5555
- name: Native Tests
5656
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
5757
working-directory: tests
@@ -75,6 +75,7 @@ jobs:
7575
board:
7676
- "arduino_mkr1300"
7777
- "arduino_mkrzero"
78+
- "arduino_nano_33_ble"
7879
- "arduino_zero"
7980
- "bast_pro_mini_m0"
8081
- "capablerobot_usbhub"
@@ -92,7 +93,6 @@ jobs:
9293
- "electronut_labs_blip"
9394
- "electronut_labs_papyr"
9495
- "escornabot_makech"
95-
- "feather_f405"
9696
- "feather_m0_adalogger"
9797
- "feather_m0_basic"
9898
- "feather_m0_express"
@@ -103,12 +103,14 @@ jobs:
103103
- "feather_m4_express"
104104
- "feather_nrf52840_express"
105105
- "feather_radiofruit_zigbee"
106+
- "feather_stm32f405_express"
106107
- "gemma_m0"
107108
- "grandcentral_m4_express"
108109
- "hallowing_m0_express"
109110
- "hallowing_m4_express"
110111
- "itsybitsy_m0_express"
111112
- "itsybitsy_m4_express"
113+
- "itsybitsy_nrf52840_express"
112114
- "kicksat-sprite"
113115
- "makerdiary_nrf52840_mdk"
114116
- "makerdiary_nrf52840_mdk_usb_dongle"
@@ -135,13 +137,15 @@ jobs:
135137
- "pyportal"
136138
- "pyportal_titano"
137139
- "pyruler"
138-
- "robohatmm1_m0"
139140
- "robohatmm1_m4"
140141
- "sam32"
141142
- "serpente"
143+
- "shirtty"
142144
- "snekboard"
143145
- "sparkfun_lumidrive"
144146
- "sparkfun_nrf52840_mini"
147+
- "sparkfun_qwiic_micro_no_flash"
148+
- "sparkfun_qwiic_micro_with_flash"
145149
- "sparkfun_redboard_turbo"
146150
- "sparkfun_samd21_dev"
147151
- "sparkfun_samd21_mini"
@@ -154,6 +158,7 @@ jobs:
154158
- "trinket_m0_haxpress"
155159
- "uchip"
156160
- "ugame10"
161+
- "winterbloom_sol"
157162

158163
steps:
159164
- name: Set up Python 3.5
@@ -164,7 +169,8 @@ jobs:
164169
run: |
165170
sudo apt-get install -y gettext
166171
pip install requests sh click setuptools awscli
167-
wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~xenial1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb
172+
wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
173+
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
168174
- name: Versions
169175
run: |
170176
gcc --version
@@ -185,7 +191,7 @@ jobs:
185191
name: ${{ matrix.board }}
186192
path: bin/${{ matrix.board }}
187193
- name: Upload to S3
188-
run: aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
194+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
189195
env:
190196
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
191197
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -194,7 +200,7 @@ jobs:
194200
run: |
195201
pip install uritemplate
196202
- name: Upload to Release
197-
run: python3 -u upload_release_files.py
203+
run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
198204
working-directory: tools
199205
env:
200206
UPLOAD_URL: ${{ github.event.release.upload_url }}

‎.github/workflows/create_website_pr.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Update CircuitPython.org
22

3-
on: release
3+
on:
4+
release:
5+
types: [published]
46

57
jobs:
68
website:
@@ -10,9 +12,6 @@ jobs:
1012
env:
1113
GITHUB_CONTEXT: ${{ toJson(github) }}
1214
run: echo "$GITHUB_CONTEXT"
13-
- name: Fail if not a release publish # workaround has `on` doesn't have this filter
14-
run: exit 1
15-
if: github.event.action != 'published'
1615
- name: Set up Python 3.5
1716
uses: actions/setup-python@v1
1817
with:

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ pseudoxml:
204204
all-source:
205205

206206
locale/circuitpython.pot: all-source
207-
find $(TRANSLATE_SOURCES) -iname "*.c" -print0 | (LC_ALL=C sort -z) | xargs -0 xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
207+
find $(TRANSLATE_SOURCES) -iname "*.c" -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
208208

209209
translate: locale/circuitpython.pot
210210
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done

‎drivers/wiznet5k/internet/dns/dns.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
#include <string.h>
5454
#include <stdlib.h>
55-
#include "tick.h"
55+
#include "supervisor/shared/tick.h"
5656

5757
//#include "Ethernet/socket.h"
5858
//#include "Internet/DNS/dns.h"
@@ -125,7 +125,7 @@ uint16_t DNS_MSGID; // DNS message ID
125125

126126

127127
uint32_t HAL_GetTick(void) {
128-
return ticks_ms;
128+
return supervisor_ticks_ms32();
129129
}
130130

131131
uint32_t hal_sys_tick;

‎lib/stm32lib‎

Submodule stm32lib deleted from d2bcfda

‎lib/utils/interrupt_char.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void mp_keyboard_interrupt(void) {
4949

5050
// Check to see if we've been CTRL-C'ed by autoreload or the user.
5151
bool mp_hal_is_interrupted(void) {
52-
return MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
52+
return MP_STATE_VM(mp_pending_exception) != NULL;
5353
}
5454

5555
#endif

0 commit comments

Comments
 (0)