Skip to content

Commit

Permalink
Merge remote-tracking branch 'adafruit/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kadeturn committed Sep 20, 2020
2 parents 8884d2a + 7b57de6 commit a119bdf
Show file tree
Hide file tree
Showing 540 changed files with 203,244 additions and 74,157 deletions.
21 changes: 9 additions & 12 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Bug report
about: Create a report to help us improve
title: "[Bug]"
title: ''
labels: Bug
assignees: ''

Expand All @@ -10,23 +10,20 @@ assignees: ''
**Describe the bug**
A clear and concise description of what the bug is.

**Set up (please complete the following information)**
- Your Board and BSP version
- Your OS (mac/windows/linux) and its version
- Serial debug log (enable IDE's Debug Mode Level to 1 or 2)
**Set up (mandatory)**
- **PC & IDE** : Arduino 1.8.13 on Ubuntu 18.04 / Windows 10/ macOS 10.15
- **BSP** : 0.20.0
- **Board** : Feather nRF52840 Express
- **Sketch**: Bluefruit52Lib/examples/Peripheral/bleuart. If it is a custom sketch, please provide a minimal sketch within codeblock

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.
3. See error

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
**Serial Log**
Serial output when IDE's Debug Mode Level to 1 or 2
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[Feature]"
title: ''
labels: Feature
assignees: ''

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Questions please use our forum support
about: Don't open issue, post your question at forums.adafruit.com
title: ''
labels: ''
labels: wontfix
assignees: ''

---
Expand Down
70 changes: 70 additions & 0 deletions .github/workflows/githubci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Build

on: [pull_request, push]

jobs:
build:
strategy:
fail-fast: false
matrix:
arduino-platform: ['cluenrf52840', 'cplaynrf52840', 'feather52832', 'feather52840', 'feather52840sense', 'itsybitsy52840']

runs-on: ubuntu-latest

steps:
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: '3.x'

- name: Checkout code
uses: actions/checkout@v2

- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive
- name: Install Arduino CLI and Tools
run: |
pip3 install adafruit-nrfutil
# make all our directories we need for files and libraries
mkdir $HOME/.arduino15
mkdir $HOME/.arduino15/packages
mkdir $HOME/Arduino
mkdir $HOME/Arduino/libraries
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
echo "::add-path::$GITHUB_WORKSPACE/bin"
- name: Install BSP and Libraries
env:
BSP_URL: https://adafruit.github.io/arduino-board-index/package_adafruit_index.json
BSP_PATH: .arduino15/packages/adafruit/hardware/nrf52
run: |
arduino-cli config init
arduino-cli core update-index
arduino-cli core update-index --additional-urls $BSP_URL
arduino-cli core install adafruit:nrf52 --additional-urls $BSP_URL
# Repalce release BSP with our code
BSP_VERSION=`eval ls $HOME/$BSP_PATH`
rm -r $HOME/$BSP_PATH/*
ln -s $GITHUB_WORKSPACE $HOME/$BSP_PATH/$BSP_VERSION
# Install library dependency
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"
# TODO update to support MIDI version 5 later on
arduino-cli lib install "MIDI Library"@4.3.1
# TODO use firmata master to prevent build error with gcc v9 (should be remove after 2.5.9 is released)
# https://github.com/firmata/arduino/pull/438
git clone --depth 1 https://github.com/firmata/arduino.git $HOME/Arduino/libraries/firmata
# Library summary
arduino-cli lib list
- name: Build examples
run: python3 tools/build_all.py ${{ matrix.arduino-platform }}
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
*.o
*.obj

# Visual Studio Code
**/.vscode/

# Executables
*.out
*.app

*.pyc
/tools/nrfutil-0.5.2/build/
/tools/nrfutil-0.5.2/dist/
/tools/nrfutil-0.5.2/nrfutil.egg-info/
/tools/.idea/
/tools/midi_tests/node_modules

.DS_Store
*.swp
/Output

# Ignore local overrides of platform.txt and boards.txt,
/boards.local.txt
/platform.local.txt
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore"]
path = cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore
url = https://github.com/adafruit/Adafruit_TinyUSB_ArduinoCore.git
[submodule "libraries/Adafruit_nRFCrypto"]
path = libraries/Adafruit_nRFCrypto
url = https://github.com/adafruit/Adafruit_nRFCrypto.git
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

30 changes: 18 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
# Arduino Core for Adafruit Bluefruit nRF52 Boards

[![Build Status](https://github.com/adafruit/Adafruit_nRF52_Arduino/workflows/Build/badge.svg)](https://github.com/adafruit/Adafruit_nRF52_Arduino/actions)

This repository contains the Arduino BSP for Adafruit Bluefruit nRF52 series:

- [Adafruit CLUE nRF52840](https://www.adafruit.com/product/4500)
- [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
- [Adafruit Feather nRF52832](https://www.adafruit.com/product/3406)
- [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062)
- [Adafruit Feather nRF52840 Sense](https://www.adafruit.com/product/4516)
- [Adafruit ItsyBitsy nRF52840 Express](https://www.adafruit.com/product/4481)
- Adafruit Metro nRF52840 Express

Following boards are also included but are not officially supported:

- [Noric nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
- [Nordic nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
- [Particle Xenon](https://store.particle.io/products/xenon)
- [Raytac MDBT50Q-RX Dongle](https://www.raytac.com/product/ins.php?index_id=89)

## BSP Installation

Expand Down Expand Up @@ -36,20 +44,20 @@ There are two methods that you can use to install this BSP. We highly recommend
* Linux : `~/Arduino`
* Windows: `~/Documents/Arduino`
4. Create a folder named `hardware/Adafruit`, if it does not exist, and change directories to it
5. Clone this repo: `git clone https://github.com/adafruit/Adafruit_nRF52_Arduino.git`
5. Clone this repo & its submodules: `git clone --recurse-submodules https://github.com/adafruit/Adafruit_nRF52_Arduino.git`
6. Restart the Arduino IDE
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.

### Adafruit's nrfutil tools

[adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) (derived from Nordic pc-nrfutil) is needed to upload sketch via serial port.
[adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) (derived from Nordic [pc-nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil)) is needed to upload sketch via serial port.

- For Windows and macOS, pre-built executable binaries are included in the BSP at `tools/adafruit-nrfutil/`. It should work out of the box.
- Linux user need to run follow command to install it from PyPi

```
$ pip3 install adafruit-nrfutil --user
```
```
$ pip3 install adafruit-nrfutil --user
```

### Drivers

Expand All @@ -74,7 +82,7 @@ To burn the bootloader from within the Arduino IDE, you will need the following
on your system and available in the system path:

- Segger [JLink Software and Documentation Pack](https://www.segger.com/downloads/jlink)
- 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)
- Nordic [nRF5x Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)

Check to make sure you can run `nrfjprog` from your terminal/command prompt

Expand Down Expand Up @@ -110,9 +118,7 @@ which in turn is based on the [Arduino SAMD Core](https://github.com/arduino/Ard

The following libraries are used:

- adafruit-nrfutil is based on Nordic Semiconductor ASA's [pc-nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil)
- [freeRTOS](https://www.freertos.org/) as operating system
- [tinyusb](https://github.com/hathach/tinyusb) as usb stack
- [FreeRTOS](https://www.freertos.org/) as operating system
- [LittleFS](https://github.com/ARMmbed/littlefs) for internal file system
- [nrfx](https://github.com/NordicSemiconductor/nrfx) for peripherals driver
- [littlefs](https://github.com/ARMmbed/littlefs) for internal file system
- [fatfs by elm-chan](http://elm-chan.org/fsw/ff/00index_e.html) for external file system
- [TinyUSB](https://github.com/hathach/tinyusb) as usb stack
Loading

0 comments on commit a119bdf

Please sign in to comment.