Skip to content

Commit a71a669

Browse files
committed
Merge branch 'master' into temp
2 parents ab62290 + e1f1884 commit a71a669

File tree

82 files changed

+51939
-51687
lines changed

Some content is hidden

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

82 files changed

+51939
-51687
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ contact_links:
33
- name: Adafruit Support Forum
44
url: https://forums.adafruit.com
55
about: If you have other questions or need help, post it here.
6+
- name: Discussion
7+
url: https://github.com/adafruit/Adafruit_nRF52_Arduino/discussions
8+
about: If you have other questions or need help, post it here.

.github/workflows/githubci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ name: Build
22

33
on: [pull_request, push]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
59
jobs:
610
build:
11+
runs-on: ubuntu-latest
712
strategy:
813
fail-fast: false
914
matrix:
@@ -16,17 +21,15 @@ jobs:
1621
- 'feather52840sense'
1722
- 'itsybitsy52840'
1823
- 'ledglasses_nrf52840'
19-
20-
runs-on: ubuntu-latest
2124

2225
steps:
2326
- name: Setup Python
24-
uses: actions/setup-python@v1
27+
uses: actions/setup-python@v4
2528
with:
2629
python-version: '3.x'
2730

2831
- name: Checkout code
29-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3033
with:
3134
submodules: 'true'
3235

@@ -58,14 +61,11 @@ jobs:
5861
5962
# Install library dependency
6063
arduino-cli lib install "Adafruit AHRS" "Adafruit APDS9960 Library" "Adafruit Arcada Library" "Adafruit BMP280 Library" "Adafruit Circuit Playground" "Adafruit EPD" "Adafruit GFX Library" "Adafruit HX8357 Library" "Adafruit ILI9341" "Adafruit LIS3MDL" "Adafruit LSM6DS" "Adafruit NeoPixel" "Adafruit NeoMatrix" "Adafruit Sensor Calibration" "Adafruit SHT31 Library" "Adafruit SSD1306" "Adafruit ST7735 and ST7789 Library" "SdFat - Adafruit Fork"
61-
arduino-cli lib install "Arduino_TensorFlowLite" "MIDI Library"
64+
arduino-cli lib install "MIDI Library" "Firmata"
6265
63-
# TODO use firmata master to prevent build error with gcc v9 (should be remove after 2.5.9 is released)
64-
# https://github.com/firmata/arduino/pull/438
65-
git clone --depth 1 https://github.com/firmata/arduino.git $HOME/Arduino/libraries/firmata
66-
67-
# TODO temporarily remove TinyUSB pre-1.0.0 version install by arduino-cli
68-
rm -r $HOME/Arduino/libraries/Adafruit_TinyUSB_Library
66+
# Arduino_TensorFlowLite is removed per maintainer request https://github.com/arduino/library-registry/pull/1748
67+
# Find a way to compile later, skip TFL example for now
68+
# arduino-cli lib install "Arduino_TensorFlowLite"
6969
7070
# Library summary
7171
arduino-cli lib list

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
*.obj
44

55
# Visual Studio Code
6-
**/.vscode/
6+
.vscode/
7+
.idea/
8+
.pio/
9+
.piopm
710

811
# Executables
912
*.out
@@ -20,4 +23,4 @@
2023
# Ignore local overrides of platform.txt and boards.txt,
2124
/boards.local.txt
2225
/platform.local.txt
23-
/libraries/**/build/
26+

0 commit comments

Comments
 (0)