Skip to content

Commit cc64403

Browse files
sommersoftsommersoft
committed
Merge branch 'super_status' of https://github.com/sommersoft/circuitpython into super_status
2 parents d1974e0 + 6ee573c commit cc64403

430 files changed

Lines changed: 3948 additions & 54505 deletions

File tree

Some content is hidden

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

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
path = lib/stm32lib
3434
url = https://github.com/micropython/stm32lib
3535
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
36-
[submodule "freetouch2"]
37-
path = ports/atmel-samd/freetouch
38-
url = https://github.com/adafruit/Adafruit_FreeTouch.git
3936
[submodule "atmel-samd/asf4"]
4037
path = ports/atmel-samd/asf4
4138
url = https://github.com/adafruit/asf4.git
@@ -46,3 +43,6 @@
4643
[submodule "lib/nrfutil"]
4744
path = lib/nrfutil
4845
url = https://github.com/adafruit/nRF52_nrfutil
46+
[submodule "ports/atmel-samd/freetouch"]
47+
path = ports/atmel-samd/freetouch
48+
url = https://github.com/adafruit/Adafruit_FreeTouch.git

‎.travis.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ env:
1111
- TRAVIS_BOARD=feather_m0_rfm69
1212
- TRAVIS_BOARD=feather_m0_rfm9x
1313
- TRAVIS_BOARD=feather_m0_express
14+
- TRAVIS_BOARD=feather_m4_express
15+
- TRAVIS_BOARD=itsybitsy_m0_express
1416
- TRAVIS_BOARD=metro_m0_express
1517
- TRAVIS_BOARD=metro_m4_express
18+
- TRAVIS_BOARD=metro_m4_express_revb
1619
- TRAVIS_BOARD=trinket_m0
1720
- TRAVIS_BOARD=gemma_m0
1821
- TRAVIS_BOARD=feather52
1922
- TRAVIS_TEST=qemu
2023
- TRAVIS_TEST=unix
24+
- TRAVIS_TEST=docs
2125

2226
addons:
2327
artifacts:
@@ -26,12 +30,6 @@ addons:
2630
target_paths: /
2731

2832
notifications:
29-
webhooks:
30-
urls:
31-
- https://webhooks.gitter.im/e/c38b3bb3a3e131d955a1
32-
on_success: change # options: [always|never|change] default: always
33-
on_failure: always # options: [always|never|change] default: always
34-
on_start: never # options: [always|never|change] default: always
3533
webhooks:
3634
urls:
3735
- https://rosie-ci.ngrok.io/travis
@@ -54,6 +52,7 @@ before_script:
5452
- ([[ $TRAVIS_BOARD != "feather52" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
5553
# For coverage testing (upgrade is used to get latest urllib3 version)
5654
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
55+
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install Sphinx sphinx-rtd-theme recommonmark)
5756
- gcc --version
5857
- ([[ -z "$TRAVIS_BOARD" ]] || arm-none-eabi-gcc --version)
5958
- python3 --version
@@ -99,6 +98,11 @@ script:
9998
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float))
10099
- echo -en 'travis_fold:end:test_mpy\\r'
101100

101+
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
102+
- ([[ $TRAVIS_TEST != "docs" ]] || sphinx-build -E -W -b html . _build/html)
103+
- echo -en 'travis_fold:end:build_docs\\r'
104+
105+
102106
# run coveralls coverage analysis (try to, even if some builds/tests failed)
103107
#- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
104108

‎CODECONVENTIONS.md‎

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

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ so will result in corrective actions such as time out or ban from the project.
88
## Developer contact
99
[@tannewt](https://github.com/tannewt) is the main developer of CircuitPython
1010
and is sponsored by [Adafruit Industries LLC](https://adafruit.com). He is
11-
reachable on [Discord](https://adafru.it/discord) as tannewt and
12-
[Gitter](gitter.im/adafruit/circuitpython) as tannewt during US West Coast
11+
reachable on [Discord](https://adafru.it/discord) as tannewt during US West Coast
1312
working hours. He also checks GitHub issues and the [Adafruit support forum](https://forums.adafruit.com/viewforum.php?f=60).
1413

1514
## Licensing

0 commit comments

Comments
 (0)