Skip to content

Commit 03bb265

Browse files
committed
Merge branch 'refs/heads/master' into add-feather-833
bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.6.2_s140_6.1.1.hex bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.6.2_s140_6.1.1.zip bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.7.0_s140_6.1.1.hex bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.7.0_s140_6.1.1.zip bootloader/circuitplayground_nrf52840/circuitplayground_nrf52840_bootloader-0.9.0_s140_6.1.1.zip bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.6.2_s140_6.1.1.hex bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.6.2_s140_6.1.1.zip bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.7.0_s140_6.1.1.hex bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.7.0_s140_6.1.1.zip bootloader/clue_nrf52840/clue_nrf52840_bootloader-0.9.0_s140_6.1.1.hex bootloader/feather_nrf52832/feather_nrf52832_bootloader-0.6.2_s132_6.1.1.hex bootloader/feather_nrf52832/feather_nrf52832_bootloader-0.6.2_s132_6.1.1.zip bootloader/feather_nrf52832/feather_nrf52832_bootloader-0.7.0_s132_6.1.1.hex bootloader/feather_nrf52832/feather_nrf52832_bootloader-0.7.0_s132_6.1.1.zip bootloader/feather_nrf52832/feather_nrf52832_bootloader-0.9.0_s132_6.1.1.hex bootloader/feather_nrf52832/feather_nrf52832_bootloader-0.9.0_s132_6.1.1.zip bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.7.0_s140_6.1.1.hex bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.7.0_s140_6.1.1.zip bootloader/feather_nrf52840_express/feather_nrf52840_express_bootloader-0.9.0_s140_6.1.1.hex bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.7.0_s140_6.1.1.hex bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.7.0_s140_6.1.1.zip bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.9.0_s140_6.1.1.hex bootloader/feather_nrf52840_sense/feather_nrf52840_sense_bootloader-0.9.0_s140_6.1.1.zip bootloader/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.6.2_s140_6.1.1.hex bootloader/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.6.2_s140_6.1.1.zip bootloader/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.7.0_s140_6.1.1.hex bootloader/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.7.0_s140_6.1.1.zip bootloader/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.9.0_s140_6.1.1.hex bootloader/itsybitsy_nrf52840_express/itsybitsy_nrf52840_express_bootloader-0.9.0_s140_6.1.1.zip bootloader/ledglasses_nrf52840/ledglasses_nrf52840_bootloader-0.6.2_s140_6.1.1.zip bootloader/ledglasses_nrf52840/ledglasses_nrf52840_bootloader-0.9.0_s140_6.1.1.hex bootloader/ledglasses_nrf52840/ledglasses_nrf52840_bootloader-0.9.0_s140_6.1.1.zip bootloader/metro_nrf52840_express/metro_nrf52840_express_bootloader-0.7.0_s140_6.1.1.hex bootloader/metro_nrf52840_express/metro_nrf52840_express_bootloader-0.7.0_s140_6.1.1.zip bootloader/metro_nrf52840_express/metro_nrf52840_express_bootloader-0.9.0_s140_6.1.1.zip bootloader/particle_xenon/particle_xenon_bootloader-0.6.2_s140_6.1.1.hex bootloader/particle_xenon/particle_xenon_bootloader-0.6.2_s140_6.1.1.zip bootloader/particle_xenon/particle_xenon_bootloader-0.7.0_s140_6.1.1.hex bootloader/particle_xenon/particle_xenon_bootloader-0.9.0_s140_6.1.1.hex bootloader/raytac_mdbt50q_rx/raytac_mdbt50q_rx_bootloader-0.6.2_s140_6.1.1.hex bootloader/raytac_mdbt50q_rx/raytac_mdbt50q_rx_bootloader-0.6.2_s140_6.1.1.zip bootloader/raytac_mdbt50q_rx/raytac_mdbt50q_rx_bootloader-0.7.0_s140_6.1.1.zip bootloader/raytac_mdbt50q_rx/raytac_mdbt50q_rx_bootloader-0.9.0_s140_6.1.1.hex bootloader/raytac_mdbt50q_rx/raytac_mdbt50q_rx_bootloader-0.9.0_s140_6.1.1.zip
2 parents 2cf814e + 0ed4d9f commit 03bb265

File tree

103 files changed

+44698
-43866
lines changed

Some content is hidden

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

103 files changed

+44698
-43866
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: 12 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:
@@ -14,19 +19,18 @@ jobs:
1419
- 'feather52832'
1520
- 'feather52840'
1621
- 'feather52840sense'
22+
- 'feather_nrf52840_sense_tft'
1723
- 'itsybitsy52840'
1824
- 'ledglasses_nrf52840'
19-
20-
runs-on: ubuntu-latest
2125

2226
steps:
2327
- name: Setup Python
24-
uses: actions/setup-python@v1
28+
uses: actions/setup-python@v4
2529
with:
2630
python-version: '3.x'
2731

2832
- name: Checkout code
29-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
3034
with:
3135
submodules: 'true'
3236

@@ -58,14 +62,11 @@ jobs:
5862
5963
# Install library dependency
6064
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"
65+
arduino-cli lib install "MIDI Library" "Firmata"
6266
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
67+
# Arduino_TensorFlowLite is removed per maintainer request https://github.com/arduino/library-registry/pull/1748
68+
# Find a way to compile later, skip TFL example for now
69+
# arduino-cli lib install "Arduino_TensorFlowLite"
6970
7071
# Library summary
7172
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+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ $ pip3 install adafruit-nrfutil --user
6969

7070
### Drivers
7171

72-
- [SiLabs CP2104 driver](http://www.silabs.com/products/mcu/pages/usbtouartbridgevcpdrivers.aspx) is required for USB to Serial when using with Feather nRF52832
72+
- [SiLabs CP2104 driver](https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers?tab=downloads) is required for USB to Serial when using with Feather nRF52832
7373

7474
## Bootloader
7575

0 commit comments

Comments
 (0)