Merge branch 'super_status' of https://github.com/sommersoft/circuitpython into super_status

Author: sommersoft

.gitmodules

@@ -33,9 +33,6 @@
 	path = lib/stm32lib
 	url = https://github.com/micropython/stm32lib
 	branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
-[submodule "freetouch2"]
-       path = ports/atmel-samd/freetouch
-       url = https://github.com/adafruit/Adafruit_FreeTouch.git
 [submodule "atmel-samd/asf4"]
        path = ports/atmel-samd/asf4
        url = https://github.com/adafruit/asf4.git
@@ -46,3 +43,6 @@
 [submodule "lib/nrfutil"]
 	path = lib/nrfutil
 	url = https://github.com/adafruit/nRF52_nrfutil
+[submodule "ports/atmel-samd/freetouch"]
+	path = ports/atmel-samd/freetouch
+	url = https://github.com/adafruit/Adafruit_FreeTouch.git

.travis.yml

@@ -11,13 +11,17 @@ env:
   - TRAVIS_BOARD=feather_m0_rfm69
   - TRAVIS_BOARD=feather_m0_rfm9x
   - TRAVIS_BOARD=feather_m0_express
+  - TRAVIS_BOARD=feather_m4_express
+  - TRAVIS_BOARD=itsybitsy_m0_express
   - TRAVIS_BOARD=metro_m0_express
   - TRAVIS_BOARD=metro_m4_express
+  - TRAVIS_BOARD=metro_m4_express_revb
   - TRAVIS_BOARD=trinket_m0
   - TRAVIS_BOARD=gemma_m0
   - TRAVIS_BOARD=feather52
   - TRAVIS_TEST=qemu
   - TRAVIS_TEST=unix
+  - TRAVIS_TEST=docs
 
 addons:
   artifacts:
@@ -26,12 +30,6 @@ addons:
     target_paths: /
 
 notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/c38b3bb3a3e131d955a1
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
   webhooks:
     urls:
       - https://rosie-ci.ngrok.io/travis
@@ -54,6 +52,7 @@ before_script:
   - ([[ $TRAVIS_BOARD != "feather52" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
   # For coverage testing (upgrade is used to get latest urllib3 version)
   - ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
+  - ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install Sphinx sphinx-rtd-theme recommonmark)
   - gcc --version
   - ([[ -z "$TRAVIS_BOARD" ]] || arm-none-eabi-gcc --version)
   - python3 --version
@@ -99,6 +98,11 @@ script:
   - ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float))
   - echo -en 'travis_fold:end:test_mpy\\r'
 
+  - (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
+  - ([[ $TRAVIS_TEST != "docs" ]] || sphinx-build -E -W -b html . _build/html)
+  - echo -en 'travis_fold:end:build_docs\\r'
+
+
   # run coveralls coverage analysis (try to, even if some builds/tests failed)
   #- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
 

CODECONVENTIONS.md

@@ -8,8 +8,7 @@ so will result in corrective actions such as time out or ban from the project.
 ## Developer contact
 [@tannewt](https://github.com/tannewt) is the main developer of CircuitPython
 and is sponsored by [Adafruit Industries LLC](https://adafruit.com). He is
-reachable on [Discord](https://adafru.it/discord) as tannewt and
-[Gitter](gitter.im/adafruit/circuitpython) as tannewt during US West Coast
+reachable on [Discord](https://adafru.it/discord) as tannewt during US West Coast
 working hours. He also checks GitHub issues and the [Adafruit support forum](https://forums.adafruit.com/viewforum.php?f=60).
 
 ## Licensing