Skip to content

Commit 23cdd53

Browse files
committed
Merge branch 'master' into develop
2 parents 5171954 + d4fdde1 commit 23cdd53

Some content is hidden

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

60 files changed

+125
-11190
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: "[Bug]"
4+
title: ''
55
labels: Bug
66
assignees: ''
77

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: "[Feature]"
4+
title: ''
55
labels: Feature
66
assignees: ''
77

.github/ISSUE_TEMPLATE/questions-please-use-our-forum-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Questions please use our forum support
33
about: Don't open issue, post your question at forums.adafruit.com
44
title: ''
5-
labels: ''
5+
labels: wontfix
66
assignees: ''
77

88
---

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore"]
2+
path = cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore
3+
url = https://github.com/adafruit/Adafruit_TinyUSB_ArduinoCore.git

.travis.yml

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
sudo: required
12
language: c
23
dist: xenial
34
git:
@@ -8,10 +9,28 @@ env:
89
global:
910
- BSP_PATH="$HOME/.arduino15/packages/adafruit/hardware/nrf52"
1011
jobs:
11-
# Split into one job per board (aka variant)
12-
- VARIANT="feather52840"
13-
- VARIANT="cplaynrf52840"
14-
- VARIANT="feather52832"
12+
# empty env required, else allow_failures will SILENTY IGNORE matching against env...
13+
-
14+
15+
jobs:
16+
fast_finish: true
17+
include:
18+
- name: "Feather 52840"
19+
env: VARIANT="feather52840"
20+
- name: "Feather 52840 (All warnings)"
21+
env: ALL_WARNINGS="true" VARIANT="feather52840"
22+
- name: "Circuit Playground 52840"
23+
env: VARIANT="cplaynrf52840"
24+
- name: "Circuit Playground 52840 (All warnings)"
25+
env: ALL_WARNINGS="true" VARIANT="cplaynrf52840"
26+
- name: "Feather 52832"
27+
env: VARIANT="feather52832"
28+
- name: "Feather 52832 (All warnings)"
29+
env: ALL_WARNINGS="true" VARIANT="feather52832"
30+
allow_failures:
31+
- env: ALL_WARNINGS="true" VARIANT="feather52840"
32+
- env: ALL_WARNINGS="true" VARIANT="cplaynrf52840"
33+
- env: ALL_WARNINGS="true" VARIANT="feather52832"
1534

1635
addons:
1736
apt:
@@ -24,6 +43,10 @@ addons:
2443
confinement: classic
2544

2645
install:
46+
# Filter only mDNS / Bonjour traffic
47+
- sudo iptables --insert INPUT --jump DROP --protocol udp --dport 5353 -m comment --comment "silently drop all 5353/udp input"
48+
- sudo iptables --insert INPUT --jump DROP --destination 224.0.0.251 -m comment --comment "silently drop all mDNS ipv4 broadcast"
49+
# Install the nRF52 support files for arduino
2750
- pip3 install --user adafruit-nrfutil
2851
- umake electronics arduino $HOME/arduino_ide
2952
- export PATH=$HOME/arduino_ide:$PATH

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ There are two methods that you can use to install this BSP. We highly recommend
3838
* Linux : `~/Arduino`
3939
* Windows: `~/Documents/Arduino`
4040
4. Create a folder named `hardware/Adafruit`, if it does not exist, and change directories to it
41-
5. Clone this repo: `git clone https://github.com/adafruit/Adafruit_nRF52_Arduino.git`
41+
5. Clone this repo & its submodules: `git clone --recurse-submodules https://github.com/adafruit/Adafruit_nRF52_Arduino.git`
4242
6. Restart the Arduino IDE
4343
7. Once the BSP is installed, select 'Adafruit Bluefruit nRF52 Feather' from the Tools -> Board menu, which will update your system config to use the right compiler and settings for the nRF52.
4444

@@ -76,7 +76,7 @@ To burn the bootloader from within the Arduino IDE, you will need the following
7676
on your system and available in the system path:
7777
7878
- Segger [JLink Software and Documentation Pack](https://www.segger.com/downloads/jlink)
79-
- Nordic [nRF5x Command Line Tools](http://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.tools%2Fdita%2Ftools%2Fnrf5x_command_line_tools%2Fnrf5x_installation.html)
79+
- Nordic [nRF5x Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
8080
8181
Check to make sure you can run `nrfjprog` from your terminal/command prompt
8282

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_TinyUSB_Core.h

Lines changed: 0 additions & 45 deletions
This file was deleted.

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.cpp

Lines changed: 0 additions & 156 deletions
This file was deleted.

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.h

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)