Skip to content

Commit 22176f8

Browse files
authored
Merge branch 'adafruit:master' into master
2 parents 146e8b8 + 024eaa5 commit 22176f8

File tree

212 files changed

+5280
-59039
lines changed

Some content is hidden

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

212 files changed

+5280
-59039
lines changed

.github/workflows/githubci.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,20 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
arduino-platform: ['metro_m0', 'hallowing', 'circuitplayground_m0',
11-
'metro_m4', 'pybadge_m4', 'pygamer_m4', 'hallowing_m4', 'pyportal_m4', 'pyportal_m4_titano']
10+
board:
11+
# Alphabetical order
12+
- 'metro_m0'
13+
- 'hallowing'
14+
- 'circuitplayground_m0'
15+
- 'metro_m4'
16+
- 'pybadge_m4'
17+
- 'pygamer_m4'
18+
- 'hallowing_m4'
19+
- 'pyportal_m4'
20+
- 'pyportal_m4_titano'
21+
- 'feather_m4_can'
22+
- 'metro_m0:usbstack=tinyusb'
23+
- 'metro_m4:speed=120,usbstack=tinyusb'
1224

1325
runs-on: ubuntu-latest
1426

@@ -20,14 +32,9 @@ jobs:
2032

2133
- name: Checkout code
2234
uses: actions/checkout@v2
35+
with:
36+
submodules: 'true'
2337

24-
- name: Checkout submodules
25-
shell: bash
26-
run: |
27-
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
28-
git submodule sync --recursive
29-
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive
30-
3138
- name: Install Arduino CLI and Tools
3239
run: |
3340
# make all our directories we need for files and libraries
@@ -42,7 +49,6 @@ jobs:
4249
env:
4350
BSP_URL: https://adafruit.github.io/arduino-board-index/package_adafruit_index.json
4451
BSP_PATH: .arduino15/packages/adafruit/hardware/samd
45-
LIB_DEPS: FlashStorage SD
4652
run: |
4753
arduino-cli config init
4854
arduino-cli core update-index
@@ -53,11 +59,7 @@ jobs:
5359
BSP_VERSION=`eval ls $HOME/$BSP_PATH`
5460
rm -r $HOME/$BSP_PATH/*
5561
ln -s $GITHUB_WORKSPACE $HOME/$BSP_PATH/$BSP_VERSION
56-
arduino-cli lib install $LIB_DEPS
62+
arduino-cli lib install "Adafruit NeoPixel" "Adafruit seesaw Library" "Adafruit SPIFlash" "FlashStorage" "MIDI Library" "SD" "SdFat - Adafruit Fork"
5763
5864
- name: Build examples
59-
run: python3 extras/build_all.py ${{ matrix.arduino-platform }}
60-
61-
# How to mark this as allowed-to-fail?
62-
- name: Build examples (-Wall)
63-
run: python3 extras/build_all.py --all_warnings --warnings_do_not_cause_job_failure
65+
run: python3 extras/build_all.py ${{ matrix.board }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
*.atsuo
33

44
bootloaders/*/build/
5-
*~
5+
*~
6+
/libraries/**/build/

.gitmodules

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
[submodule "cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore"]
2-
path = cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore
3-
url = https://github.com/adafruit/Adafruit_TinyUSB_ArduinoCore.git
1+
[submodule "libraries/Adafruit_TinyUSB_Arduino"]
2+
path = libraries/Adafruit_TinyUSB_Arduino
3+
url = https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
4+
[submodule "libraries/Adafruit_ZeroDMA"]
5+
path = libraries/Adafruit_ZeroDMA
6+
url = https://github.com/adafruit/Adafruit_ZeroDMA

0 commit comments

Comments
 (0)