kamtom480 · kamtom480 · May 8, 2019 · May 15, 2019 · May 14, 2019 · May 17, 2019
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,7 @@
 *.bat text eol=crlf
 
 # These are binary so should never be modified by git.
+*.a binary
 *.png binary
 *.jpg binary
 *.dxf binary

diff --git a/.gitmodules b/.gitmodules
@@ -15,3 +15,15 @@
 	path = lib/stm32lib
 	url = https://github.com/micropython/stm32lib
 	branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
+[submodule "lib/nrfx"]
+	path = lib/nrfx
+	url = https://github.com/NordicSemiconductor/nrfx.git
+[submodule "lib/mbedtls"]
+	path = lib/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "lib/asf4"]
+	path = lib/asf4
+	url = https://github.com/adafruit/asf4
+[submodule "lib/tinyusb"]
+	path = lib/tinyusb
+	url = https://github.com/hathach/tinyusb
diff --git a/.travis.yml b/.travis.yml
@@ -1,77 +1,220 @@
-sudo: required
-dist: trusty
-language: c
+# global options
+dist: xenial
+language:
+  - c
 compiler:
   - gcc
 cache:
   directories:
     - "${HOME}/persist"
 env:
-  - MAKEOPTS="-j4"
-
-before_script:
-# Extra CPython versions
-#  - sudo add-apt-repository -y ppa:fkrull/deadsnakes
-# Extra gcc versions
-#  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
-  - sudo dpkg --add-architecture i386
-  - sudo apt-get update -qq || true
-  - sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system gcc-mingw-w64
-  - sudo apt-get install -y --force-yes gcc-arm-none-eabi
-  # For teensy build
-  - sudo apt-get install realpath
-  # For coverage testing (a specific urllib3 version is needed for requests and cpp-coveralls to work together)
-  - sudo pip install -Iv urllib3==1.22
-  - sudo pip install cpp-coveralls
-  - gcc --version
-  - arm-none-eabi-gcc --version
-  - python3 --version
-
-script:
-  - make ${MAKEOPTS} -C mpy-cross
-  - make ${MAKEOPTS} -C ports/minimal CROSS=1 build/firmware.bin
-  - ls -l ports/minimal/build/firmware.bin
-  - tools/check_code_size.sh
-  - mkdir -p ${HOME}/persist
-  # Save new firmware for reference, but only if building a main branch, not a pull request
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp ports/minimal/build/firmware.bin ${HOME}/persist/; fi'
-  - make ${MAKEOPTS} -C ports/unix deplibs
-  - make ${MAKEOPTS} -C ports/unix
-  - make ${MAKEOPTS} -C ports/unix nanbox
-  - make ${MAKEOPTS} -C ports/bare-arm
-  - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
-  - make ${MAKEOPTS} -C ports/stm32
-  - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-  - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32F769DISC
-  - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32L476DISC
-  - make ${MAKEOPTS} -C ports/teensy
-  - make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
-  - make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
-  - make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
-
-  # run tests without coverage info
-  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests)
-  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native)
-
-  # run tests with coverage info
-  - make ${MAKEOPTS} -C ports/unix coverage
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float)
-
-  # test when input script comes from stdin
-  - cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
-
-  # 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)
-
-  # run tests on stackless build
-  - rm -rf ports/unix/build-coverage
-  - make ${MAKEOPTS} -C ports/unix coverage CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
-
-after_failure:
-  - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
-  - (grep "FAIL" ports/qemu-arm/build/console.out)
+  global:
+    - MAKEOPTS="-j4"
+git:
+  submodules: false
+
+# define the successive stages
+stages:
+  - name: test
+
+# define the jobs for the stages
+# order of the jobs has longest running first to optimise total time
+jobs:
+  include:
+    # stm32 port
+    - stage: test
+      env: NAME="stm32 port build"
+      install:
+        # need newer gcc version for Cortex-M7 support
+        - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
+        - sudo apt-get update -qq || true
+        - sudo apt-get install gcc-arm-embedded
+        - sudo apt-get install libnewlib-arm-none-eabi
+        - arm-none-eabi-gcc --version
+      script:
+        - git submodule update --init lib/lwip lib/mbedtls lib/stm32lib
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/stm32
+        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
+        - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32F769DISC CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+        - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32L476DISC
+        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
+
+    # qemu-arm port
+    - stage: test
+      env: NAME="qemu-arm port build and tests"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install qemu-system
+        - arm-none-eabi-gcc --version
+        - qemu-system-arm --version
+      script:
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
+      after_failure:
+        - grep "FAIL" ports/qemu-arm/build/console.out
+
+    # unix coverage
+    - stage: test
+      env: NAME="unix coverage build and tests"
+      install:
+        - sudo pip install cpp-coveralls
+        - gcc --version
+        - python3 --version
+      script:
+        - git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/unix deplibs
+        - make ${MAKEOPTS} -C ports/unix coverage
+        # run the main test suite
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
+        # test when input script comes from stdin
+        - cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
+        # 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)
+      after_failure:
+        - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
+
+    # standard unix port
+    - stage: test
+      env: NAME="unix port build and tests"
+      script:
+        - git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/unix deplibs
+        - make ${MAKEOPTS} -C ports/unix
+        - make ${MAKEOPTS} -C ports/unix test
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
+
+    # unix nanbox
+    - stage: test
+      env: NAME="unix nanbox port build and tests"
+      install:
+        - sudo apt-get install gcc-multilib libffi-dev:i386
+      script:
+        - git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/unix deplibs
+        - make ${MAKEOPTS} -C ports/unix nanbox
+        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
+
+    # unix stackless
+    - stage: test
+      env: NAME="unix stackless port build and tests with clang"
+      install:
+        - sudo apt-get install clang
+      script:
+        - git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+        - make ${MAKEOPTS} -C mpy-cross CC=clang
+        - make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
+        - make ${MAKEOPTS} -C ports/unix CC=clang test
+
+    # windows port via mingw
+    - stage: test
+      env: NAME="windows port build via mingw"
+      install:
+        - sudo apt-get install gcc-mingw-w64
+      script:
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
+
+    # esp32 port
+    - stage: test
+      env: NAME="esp32 port build"
+      install:
+        - sudo apt-get install python3-pip
+        - sudo pip3 install pyparsing
+        - wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
+        - zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
+        - export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
+        - git clone https://github.com/espressif/esp-idf.git
+        - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
+        - git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
+      script:
+        - git submodule update --init lib/berkeley-db-1.xx
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
+
+    # esp8266 port
+    - stage: test
+      env: NAME="esp8266 port build"
+      install:
+        - wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
+        - zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+        - export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
+      script:
+        - git submodule update --init lib/axtls lib/berkeley-db-1.xx
+        - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/esp8266
+
+    # nrf port
+    - stage: test
+      env: NAME="nrf port build"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+        - arm-none-eabi-gcc --version
+      script:
+        - git submodule update --init lib/nrfx
+        - make ${MAKEOPTS} -C ports/nrf
+
+    # bare-arm and minimal ports
+    - stage: test
+      env: NAME="bare-arm and minimal ports build"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+        - arm-none-eabi-gcc --version
+      script:
+        - make ${MAKEOPTS} -C ports/bare-arm
+        - make ${MAKEOPTS} -C ports/minimal CROSS=1 build/firmware.bin
+        - ls -l ports/minimal/build/firmware.bin
+        - tools/check_code_size.sh
+        - mkdir -p ${HOME}/persist
+        # Save new firmware for reference, but only if building a main branch, not a pull request
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp ports/minimal/build/firmware.bin ${HOME}/persist/; fi'
+
+    # cc3200 port
+    - stage: test
+      env: NAME="cc3200 port build"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+      script:
+        - make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
+        - make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
+
+    # samd port
+    - stage: test
+      env: NAME="samd port build"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+      script:
+        - git submodule update --init lib/asf4 lib/tinyusb
+        - make ${MAKEOPTS} -C ports/samd
+
+    # teensy port
+    - stage: test
+      env: NAME="teensy port build"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+      script:
+        - make ${MAKEOPTS} -C ports/teensy
+
+    # spresense port
+    - stage: test
+      env: NAME="spresense port build"
+      install:
+        - sudo apt-get install gcc-arm-none-eabi
+        - sudo apt-get install libnewlib-arm-none-eabi
+        - git -C ports/spresense clone https://github.com/sonydevworld/spresense-micropython.git spresense-sdk
+      script:
+        - make ${MAKEOPTS} -C ports/spresense
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
@@ -762,7 +762,6 @@ today.  The names appear in order of pledging.
     1642 Udine
  1643 Simon Critchley
  1644 Sven Haiges, Germany
- 1645 Yi Qing Sim
  1646 "silicium" ("silicium_one", if "silicium" is busy)
  1648 Andy O'Malia, @andyomalia
  1650 RedCamelApps.com

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013, 2014 Damien P. George
+Copyright (c) 2013-2019 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -41,8 +41,7 @@ Major components in this repository:
   to port MicroPython to another microcontroller.
 - tests/ -- test framework and test scripts.
 - docs/ -- user documentation in Sphinx reStructuredText format. Rendered
-  HTML documentation is available at http://docs.micropython.org (be sure
-  to select needed board/port at the bottom left corner).
+  HTML documentation is available at http://docs.micropython.org.
 
 Additional components:
 - ports/bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
@@ -51,15 +50,30 @@ Additional components:
   (preliminary but functional).
 - ports/pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers.
 - ports/cc3200/ -- a version of MicroPython that runs on the CC3200 from TI.
-- ports/esp8266/ -- an experimental port for ESP8266 WiFi modules.
+- ports/esp8266/ -- a version of MicroPython that runs on Espressif's ESP8266 SoC.
+- ports/esp32/ -- a version of MicroPython that runs on Espressif's ESP32 SoC.
+- ports/nrf/ -- a version of MicroPython that runs on Nordic's nRF51 and nRF52 MCUs.
 - extmod/ -- additional (non-core) modules implemented in C.
 - tools/ -- various tools, including the pyboard.py module.
 - examples/ -- a few example Python scripts.
 
 The subdirectories above may include READMEs with additional info.
 
 "make" is used to build the components, or "gmake" on BSD-based systems.
-You will also need bash, gcc, and Python (at least 2.7 or 3.3).
+You will also need bash, gcc, and Python 3.3+ available as the command `python3`
+(if your system only has Python 2.7 then invoke make with the additional option
+`PYTHON=python2`).
+
+The MicroPython cross-compiler, mpy-cross
+-----------------------------------------
+
+Most ports require the MicroPython cross-compiler to be built first.  This
+program, called mpy-cross, is used to pre-compile Python scripts to .mpy
+files which can then be included (frozen) into the firmware/executable for
+a port.  To build mpy-cross use:
+
+    $ cd mpy-cross
+    $ make
 
 The Unix version
 ----------------
@@ -74,7 +88,6 @@ To build (see section below for required dependencies):
 
     $ git submodule update --init
     $ cd ports/unix
-    $ make axtls
     $ make
 
 Then to give it a try: