Skip to content

Commit 95e0309

Browse files
committed
Merge remote-tracking branch 'adafruit/master' into mini_sam
2 parents 754d6af + ab94344 commit 95e0309

File tree

360 files changed

+28651
-9252
lines changed

Some content is hidden

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

360 files changed

+28651
-9252
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit
7676
[submodule "ports/nrf/nrfx"]
7777
path = ports/nrf/nrfx
78-
url = https://github.com/NordicSemiconductor/nrfx.git
78+
url = https://github.com/adafruit/nrfx.git
7979
[submodule "lib/tinyusb"]
8080
path = lib/tinyusb
81-
url = https://github.com/hathach/tinyusb.git
81+
url = https://github.com/tannewt/tinyusb.git
8282
branch = develop
8383
[submodule "tools/huffman"]
8484
path = tools/huffman

.travis.yml

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,31 @@
11
sudo: required
2-
dist: trusty
2+
dist: xenial
33
language: c
44
compiler:
55
- gcc
66
git:
77
depth: 1
88

9-
# Put a representative board from each port or sub-port near the top
10-
# to determine more quickly whether that port is going to build or not.
9+
# Each item under 'env' is a separate Travis job to execute.
10+
# They run in separate environments, so each one must take the time
11+
# to clone the repository and submodules; to download and install SDKs,
12+
# pip packages, and so forth. By gathering activities together in optimal
13+
# ways, the "run time" and "total time" of the travis jobs can be minimized.
14+
#
15+
# Since at the time of writing Travis generally starts 5 or 6 jobs, the
16+
# builds have been organized into 5 groups of *approximately* equal durations.
17+
# Additionally, the jobs that need extra SDKs are also organized together.
18+
#
19+
# When adding new boards, take a look on the travis CI page
20+
# https://travis-ci.org/adafruit/circuitpython to which build that installs
21+
# that SDK is shortest and add it there. In the case of major re-organizations,
22+
# just try to make the builds "about equal in run time"
1123
env:
12-
- TRAVIS_TEST=unix
13-
- TRAVIS_TEST=docs
14-
- TRAVIS_TEST=translations
15-
- TRAVIS_BOARD=feather_huzzah
16-
- TRAVIS_BOARD=circuitplayground_express
17-
- TRAVIS_BOARD=pca10056
18-
# The rest of the boards, in alphabetical order.
19-
- TRAVIS_BOARD=trinket_m0
20-
- TRAVIS_BOARD=feather_m4_express
21-
- TRAVIS_BOARD=grandcentral_m4_express
22-
- TRAVIS_BOARD=arduino_zero
23-
- TRAVIS_BOARD=circuitplayground_express_crickit
24-
- TRAVIS_BOARD=feather_m0_adalogger
25-
- TRAVIS_BOARD=feather_m0_basic
26-
- TRAVIS_BOARD=feather_m0_express
27-
- TRAVIS_BOARD=feather_m0_express_crickit
28-
- TRAVIS_BOARD=feather_m0_rfm69
29-
- TRAVIS_BOARD=feather_m0_rfm9x
30-
- TRAVIS_BOARD=feather_nrf52832
31-
- TRAVIS_BOARD=feather_nrf52840_express
32-
- TRAVIS_BOARD=feather_radiofruit_zigbee
33-
- TRAVIS_BOARD=gemma_m0
34-
- TRAVIS_BOARD=hallowing_m0_express
35-
- TRAVIS_BOARD=itsybitsy_m0_express
36-
- TRAVIS_BOARD=itsybitsy_m4_express
37-
- TRAVIS_BOARD=metro_m0_express
38-
- TRAVIS_BOARD=metro_m4_express
39-
- TRAVIS_BOARD=pca10059
40-
- TRAVIS_BOARD=pirkey_m0
41-
- TRAVIS_BOARD=trellis_m4_express
24+
- TRAVIS_TESTS="unix docs translations" TRAVIS_BOARDS="feather_huzzah circuitplayground_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express makerdiary_nrf52840_mdk" TRAVIS_SDK=arm:nrf:esp8266
25+
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
26+
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
27+
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300" TRAVIS_SDK=arm
28+
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick" TRAVIS_SDK=arm
4229

4330
addons:
4431
artifacts:
@@ -57,21 +44,33 @@ notifications:
5744
on_error: always
5845

5946
before_script:
47+
# Expand the git tree back to 4.0.0-alpha.1 and then fetch the latest tag.
48+
- LAST_TAG=`git ls-remote --quiet --tags --sort=version:refname | egrep -o "refs/tags/[0-9]+.*\$" | tail -n 1`
49+
- git fetch --shallow-exclude=4.0.0-alpha.1
50+
- git fetch --depth 1 origin $LAST_TAG:$LAST_TAG
51+
- git describe --dirty --always --tags
52+
- function var_search () { case "$1" in *$2*) true;; *) false;; esac; }
6053
- sudo dpkg --add-architecture i386
6154

62-
- ([[ -z "$TRAVIS_BOARD" || $TRAVIS_BOARD = "feather_huzzah" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
55+
- (! var_search "${TRAVIS_SDK-}" arm || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~xenial1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
6356

6457
# For nrf builds
65-
- ([[ $TRAVIS_BOARD != "feather_nrf52832" && $TRAVIS_BOARD != "feather_nrf52840_express" && $TRAVIS_BOARD != "pca10056" && $TRAVIS_BOARD != "pca10059" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
58+
- (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/bluetooth/download_ble_stack.sh)
59+
6660
# For huzzah builds
67-
- if [[ $TRAVIS_BOARD = "feather_huzzah" ]]; then wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar xavf xtensa-lx106-elf-standalone.tar.gz; PATH=$(readlink -f xtensa-lx106-elf/bin):$PATH; fi
61+
- (! var_search "${TRAVIS_SDK-}" esp8266 || (wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar -C .. -xavf xtensa-lx106-elf-standalone.tar.gz))
62+
- if var_search "${TRAVIS_SDK-}" esp8266 ; then PATH=$(readlink -f ../xtensa-lx106-elf/bin):$PATH; fi
63+
6864
# For coverage testing (upgrade is used to get latest urllib3 version)
69-
- ([[ -z "$TRAVIS_TEST" ]] || sudo apt-get install -y python3-pip)
70-
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
71-
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
72-
- ([[ $TRAVIS_TEST != "translations" ]] || sudo pip3 install polib)
65+
- ([[ -z "$TRAVIS_TESTS" ]] || sudo apt-get install -y python3-pip)
66+
- ([[ -z "$TRAVIS_TESTS" ]] || sudo pip install --upgrade cpp-coveralls)
67+
- (! var_search "${TRAVIS_TESTS-}" docs || sudo pip install 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
68+
- (! var_search "${TRAVIS_TESTS-}" translations || sudo pip3 install polib)
69+
70+
# report some good version numbers to the build
7371
- gcc --version
74-
- ([[ -z "$TRAVIS_BOARD" || $TRAVIS_BOARD = "feather_huzzah" ]] || arm-none-eabi-gcc --version)
72+
- (! var_search "${TRAVIS_SDK-}" arm || arm-none-eabi-gcc --version)
73+
- (! var_search "${TRAVIS_SDK-}" esp8266 || xtensa-lx106-elf-gcc --version)
7574
- python3 --version
7675

7776
script:
@@ -81,13 +80,11 @@ script:
8180
- echo -en 'travis_fold:end:mpy-cross\\r'
8281

8382
- echo 'Building Adafruit binaries' && echo -en 'travis_fold:start:adafruit-bins\\r'
84-
- ([[ -z "$TRAVIS_BOARD" ]] || tools/build_adafruit_bins.sh)
83+
- (for board in $TRAVIS_BOARDS; do TRAVIS_BOARD=$board tools/build_adafruit_bins.sh || exit $?; done)
8584
- echo -en 'travis_fold:end:adafruit-bins\\r'
8685

8786
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
88-
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix deplibs -j2)
89-
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix -j2)
90-
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix coverage -j2)
87+
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2))
9188
- echo -en 'travis_fold:end:unix\\r'
9289

9390
# run tests without coverage info
@@ -96,27 +93,27 @@ script:
9693

9794
# run tests with coverage info
9895
- echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
99-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
96+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
10097
- echo -en 'travis_fold:end:test_all\\r'
10198

10299
- echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
103-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
100+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
104101
- echo -en 'travis_fold:end:test_threads\\r'
105102

106103
- echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
107-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
104+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
108105
- echo -en 'travis_fold:end:test_native\\r'
109106

110107
- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
111-
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
108+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
112109
- echo -en 'travis_fold:end:test_mpy\\r'
113110

114111
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
115-
- ([[ $TRAVIS_TEST != "docs" ]] || sphinx-build -E -W -b html . _build/html)
112+
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html)
116113
- echo -en 'travis_fold:end:build_docs\\r'
117114

118115
- (echo 'Building translations' && echo -en 'travis_fold:start:build_translations\\r')
119-
- ([[ $TRAVIS_TEST != "translations" ]] || make check-translate)
116+
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate)
120117
- echo -en 'travis_fold:end:build_translations\\r'
121118

122119
# run coveralls coverage analysis (try to, even if some builds/tests failed)

README.rst

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,21 @@ Supported Boards
3030
Designed for CircuitPython
3131
~~~~~~~~~~~~~~~~~~~~~~~~~~
3232

33+
**M0 Boards**
34+
3335
- `Adafruit CircuitPlayground Express <https://www.adafruit.com/product/3333>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart>`__)
3436
- `Adafruit Feather M0 Express <https://www.adafruit.com/product/3403>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-feather-m0-express-designed-for-circuit-python-circuitpython/kattni-circuitpython>`__)
35-
- `Adafruit Metro M0 Express <https://www.adafruit.com/product/3505>`_ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m0-express-designed-for-circuitpython/circuitpython>`__)
3637
- `Adafruit Gemma M0 <https://www.adafruit.com/product/3501>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-gemma-m0/circuitpython>`__)
38+
- `Adafruit Hallowing M0 Express <https://www.adafruit.com/product/3900>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-hallowing/circuitpython>`__)
3739
- `Adafruit ItsyBitsy M0 Express <https://www.adafruit.com/product/3727>`_ (`CircuitPython Guide <https://learn.adafruit.com/introducing-itsy-bitsy-m0/circuitpython>`__)
40+
- `Adafruit Metro M0 Express <https://www.adafruit.com/product/3505>`_ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m0-express-designed-for-circuitpython/circuitpython>`__)
3841
- `Adafruit Trinket M0 <https://www.adafruit.com/product/3500>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-trinket-m0-circuitpython-arduino/circuitpython>`__)
39-
- `Adafruit Metro M4 <https://www.adafruit.com/product/3382>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m4-express-featuring-atsamd51/overview>`__)
42+
43+
**M4 Boards**
44+
45+
- `Adafruit Feather M4 Express <https://www.adafruit.com/product/3857>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-feather-m4-express-atsamd51/circuitpython>`__)
46+
- `Adafruit ItsyBitsy M4 Express <https://www.adafruit.com/product/3800>`__ (`CircuitPython Guide <https://learn.adafruit.com/introducing-adafruit-itsybitsy-m4/circuitpython>`__)
47+
- `Adafruit Metro M4 Express <https://www.adafruit.com/product/3382>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m4-express-featuring-atsamd51/circuitpython>`__)
4048

4149
Other
4250
~~~~~
@@ -53,6 +61,13 @@ Other
5361
library <https://github.com/adafruit/Adafruit_CircuitPython_SD>`__)
5462
- `Arduino Zero <https://www.arduino.cc/en/Main/ArduinoBoardZero>`__
5563

64+
"Third-party" or "non-Adafruit" boards
65+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
66+
67+
- `Electronic Cats Meow Meow <https://electroniccats.com/gomeow/>`__
68+
- `Electronic Cats CatWAN USB Stick <https://electroniccats.com/producto/catwan_usb_stick/>`__
69+
70+
5671
Download
5772
--------
5873

conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
# directories to ignore when looking for source files.
8585
exclude_patterns = ["**/build*",
8686
".venv",
87+
".direnv",
8788
"docs/README.md",
8889
"drivers",
8990
"examples",
@@ -114,7 +115,7 @@
114115
"ports/esp8266/modules",
115116
"ports/minimal",
116117
"ports/nrf/device",
117-
"ports/nrf/drivers",
118+
"ports/nrf/bluetooth",
118119
"ports/nrf/modules",
119120
"ports/nrf/nrfx",
120121
"ports/nrf/peripherals",

0 commit comments

Comments
 (0)