Merge pull request #369 from tannewt/nrf2_merge

Nrf52 merge

Author: dhalbert

.gitattributes

@@ -15,16 +15,13 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
-stmhal/pybcdc.inf_template -text
-stmhal/usbd_* -text
-stmhal/boards/*/stm32f4xx_hal_conf.h -text
-stmhal/cmsis/** -text
-stmhal/hal/** -text
-stmhal/usbdev/** -text
-stmhal/usbhost/** -text
-cc3200/hal/aes.c -text
-cc3200/hal/aes.h -text
-cc3200/hal/des.c -text
-cc3200/hal/i2s.c -text
-cc3200/hal/i2s.h -text
-cc3200/version.h -text
+ports/stm32/pybcdc.inf_template -text
+ports/stm32/usbd_* -text
+ports/stm32/usbdev/** -text
+ports/stm32/usbhost/** -text
+ports/cc3200/hal/aes.c -text
+ports/cc3200/hal/aes.h -text
+ports/cc3200/hal/des.c -text
+ports/cc3200/hal/i2s.c -text
+ports/cc3200/hal/i2s.h -text
+ports/cc3200/version.h -text

.gitmodules

@@ -11,19 +11,12 @@
 [submodule "lib/berkeley-db-1.xx"]
 	path = lib/berkeley-db-1.xx
 	url = https://github.com/pfalcon/berkeley-db-1.xx
-[submodule "freetouch2"]
-	path = atmel-samd/freetouch
-	url = https://github.com/adafruit/Adafruit_FreeTouch.git
 [submodule "tools/uf2"]
 	path = tools/uf2
 	url = https://github.com/Microsoft/uf2.git
 [submodule "atmel-samd/frozen/Adafruit_CircuitPython_NeoPixel"]
 	path = frozen/Adafruit_CircuitPython_NeoPixel
 	url = https://github.com/adafruit/Adafruit_CircuitPython_NeoPixel
-[submodule "atmel-samd/asf4"]
-	path = atmel-samd/asf4
-	url = https://github.com/adafruit/asf4.git
-	branch = circuitpython
 [submodule "frozen/Adafruit_CircuitPython_Thermistor"]
 	path = frozen/Adafruit_CircuitPython_Thermistor
 	url = https://github.com/adafruit/Adafruit_CircuitPython_Thermistor.git
@@ -33,3 +26,14 @@
 [submodule "frozen/Adafruit_CircuitPython_BusDevice"]
 	path = frozen/Adafruit_CircuitPython_BusDevice
 	url = https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git
+[submodule "lib/stm32lib"]
+	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
+       branch = circuitpython

.travis.yml

@@ -37,41 +37,55 @@ before_script:
   - sudo apt-get install -y --force-yes gcc-arm-embedded
   # For teensy build
   - sudo apt-get install realpath
-  # For coverage testing
-  # cpp-coveralls 0.4 conflicts with urllib3 preinstalled in Travis VM
-  - sudo pip install cpp-coveralls==0.3.12
+  # For coverage testing (upgrade is used to get latest urllib3 version)
+  - sudo pip install --upgrade cpp-coveralls
   - gcc --version
   - arm-none-eabi-gcc --version
   - python3 --version
 
 script:
   # Build mpy-cross first because other builds depend on it.
+  - echo 'Building mpy-cross' && echo -en 'travis_fold:start:mpy-cross\\r'
   - make -C mpy-cross
+  - echo -en 'travis_fold:end:mpy-cross\\r'
+  - echo 'Building Adafruit binaries' && echo -en 'travis_fold:start:adafruit-bins\\r'
   - tools/build_adafruit_bins.sh
-  - make -C minimal CROSS=1 build/firmware.bin
-  - ls -l minimal/build/firmware.bin
-  - mkdir -p ${HOME}/persist
+  - echo -en 'travis_fold:end:adafruit-bins\\r'
+  - make -C ports/minimal CROSS=1 build/firmware.bin
+  - ls -l ports/minimal/build/firmware.bin
+  #- 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 minimal/build/firmware.bin ${HOME}/persist/; fi'
-  - make -C unix deplibs
-  - make -C unix
-  - make -C bare-arm
-  - make -C qemu-arm test
+  #- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp ports/minimal/build/firmware.bin ${HOME}/persist/; fi'
+  - echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
+  - make -C ports/unix deplibs
+  - make -C ports/unix
+  - make -C ports/unix coverage
+  - echo -en 'travis_fold:end:unix\\r'
+  - echo 'Building qemu' && echo -en 'travis_fold:start:qemu\\r'
+  - make -C ports/qemu-arm test
+  - echo -en 'travis_fold:end:qemu\\r'
 
   # 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 -C unix coverage
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests)
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests -d thread)
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native)
-  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --via-mpy -d basics float)
+  - echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
+  - echo -en 'travis_fold:end:test_all\\r'
+  - echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
+  - echo -en 'travis_fold:end:test_threads\\r'
+  - echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
+  - echo -en 'travis_fold:end:test_native\\r'
+  - echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r'
+  - (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'
 
   # run coveralls coverage analysis (try to, even if some builds/tests failed)
-  #- (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
+  #- (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)
-  - (grep "FAIL" qemu-arm/build/console.out)
+  - (grep "FAIL" ports/qemu-arm/build/console.out)

README.md

@@ -177,24 +177,24 @@ CircuitPython:
 Ports include the code unique to a microcontroller line and also
 variations based on the board.
 
-* `atmel-samd` Support for SAMD21 based boards such as [Arduino Zero][],
+* `ports/atmel-samd` Support for SAMD21 based boards such as [Arduino Zero][],
   [Adafruit Feather M0 Basic][], and [Adafruit Feather M0 Bluefruit LE][].
-* `bare-arm` A bare minimum version of MicroPython for ARM MCUs.
-* `cc3200` Support for boards based [CC3200](http://www.ti.com/product/CC3200)
+* `ports/bare-arm` A bare minimum version of MicroPython for ARM MCUs.
+* `ports/cc3200` Support for boards based [CC3200](http://www.ti.com/product/CC3200)
   from TI such as the [WiPy 1.0](https://www.pycom.io/solutions/py-boards/wipy1/).
-* `esp8266` Support for boards based on ESP8266 WiFi modules such as the
+* `ports/esp8266` Support for boards based on ESP8266 WiFi modules such as the
   [Adafruit Feather HUZZAH][].
-* `minimal` A minimal MicroPython port. Start with this if you want
+* `ports/minimal` A minimal MicroPython port. Start with this if you want
   to port MicroPython to another microcontroller.
-* `pic16bit` Support for 16-bit PIC microcontrollers.
-* `qemu-arm` Support for ARM emulation through [QEMU](https://qemu.org).
-* `stmhal` Support for boards based on STM32 microcontrollers including
+* `ports/pic16bit` Support for 16-bit PIC microcontrollers.
+* `ports/qemu-arm` Support for ARM emulation through [QEMU](https://qemu.org).
+* `ports/stm32` Support for boards based on STM32 microcontrollers including
   the MicroPython flagship [PyBoard](https://store.micropython.org/store/#/products/PYBv1_1).
-* `teensy` Support for the Teensy line of boards such as the
+* `ports/teensy` Support for the Teensy line of boards such as the
   [Teensy 3.1](https://www.pjrc.com/teensy/teensy31.html).
-* `unix` Support for UNIX.
-* `windows` Support for [Windows](https://www.microsoft.com/en-us/windows/).
-* `zephyr` Support for [Zephyr](https://www.zephyrproject.org/), a
+* `ports/unix` Support for UNIX.
+* `ports/windows` Support for [Windows](https://www.microsoft.com/en-us/windows/).
+* `ports/zephyr` Support for [Zephyr](https://www.zephyrproject.org/), a
   real-time operating system by the Linux Foundation.
 
 CircuitPython only maintains the `atmel-samd` and `esp8266` ports. The

atmel-samd/freetouch

@@ -20,6 +20,20 @@ To set the colour of pixels use::
     >>> np[1] = (0, 128, 0) # set to green, half brightness
     >>> np[2] = (0, 0, 64)  # set to blue, quarter brightness
 
+For LEDs with more than 3 colours, such as RGBW pixels or RGBY pixels, the
+NeoPixel class takes a ``bpp`` parameter. To setup a NeoPixel object for an
+RGBW Pixel, do the following::
+
+    >>> import machine, neopixel
+    >>> np = neopixel.NeoPixel(machine.Pin(4), 8, bpp=4)
+
+In a 4-bpp mode, remember to use 4-tuples instead of 3-tuples to set the colour.
+For example to set the first three pixels use::
+
+    >>> np[0] = (255, 0, 0, 128) # Orange in an RGBY Setup
+    >>> np[1] = (0, 255, 0, 128) # Yellow-green in an RGBY Setup
+    >>> np[2] = (0, 0, 255, 128) # Green-blue in an RGBY Setup
+
 Then use the ``write()`` method to output the colours to the LEDs::
 
     >>> np.write()

atmel-samd/tools/bossac.exe

@@ -76,20 +76,24 @@ Example::
 Functions
 ---------
 
-.. function:: open(stream, \*, flags=0, cachesize=0, pagesize=0, minkeypage=0)
+.. function:: open(stream, \*, flags=0, pagesize=0, cachesize=0, minkeypage=0)
 
    Open a database from a random-access `stream` (like an open file). All
    other parameters are optional and keyword-only, and allow to tweak advanced
    parameters of the database operation (most users will not need them):
 
    * *flags* - Currently unused.
-   * *cachesize* - Suggested maximum memory cache size in bytes. For a
-     board with enough memory using larger values may improve performance.
-     The value is only a recommendation, the module may use more memory if
-     values set too low.
    * *pagesize* - Page size used for the nodes in BTree. Acceptable range
-     is 512-65536. If 0, underlying I/O block size will be used (the best
-     compromise between memory usage and performance).
+     is 512-65536. If 0, a port-specific default will be used, optimized for
+     port's memory usage and/or performance.
+   * *cachesize* - Suggested memory cache size in bytes. For a
+     board with enough memory using larger values may improve performance.
+     Cache policy is as follows: entire cache is not allocated at once;
+     instead, accessing a new page in database will allocate a memory buffer
+     for it, until value specified by *cachesize* is reached. Then, these
+     buffers will be managed using LRU (least recently used) policy. More
+     buffers may still be allocated if needed (e.g., if a database contains
+     big keys and/or values). Allocated cache buffers aren't reclaimed.
    * *minkeypage* - Minimum number of keys to store per page. Default value
      of 0 equivalent to 2.
 

cc3200/misc/mpexception.c

@@ -38,9 +38,9 @@ Constructors
         - *width* is the width of the FrameBuffer in pixels
         - *height* is the height of the FrameBuffer in pixels
         - *format* specifies the type of pixel used in the FrameBuffer;
-          valid values are ``framebuf.MVLSB``, ``framebuf.RGB565``
-          and ``framebuf.GS4_HMSB``. MVLSB is monochrome 1-bit color,
-          RGB565 is RGB 16-bit color, and GS4_HMSB is grayscale 4-bit color.
+          permissible values are listed under Constants below. These set the
+          number of bits used to encode a color value and the layout of these
+          bits in *buffer*.
           Where a color value c is passed to a method, c is a small integer
           with an encoding that is dependent on the format of the FrameBuffer.
         - *stride* is the number of pixels between each horizontal line
@@ -110,8 +110,9 @@ Other methods
     corresponding color will be considered transparent: all pixels with that
     color value will not be drawn.
 
-    This method works between FrameBuffer's utilising different formats, but the
-    resulting colors may be unexpected due to the mismatch in color formats.
+    This method works between FrameBuffer instances utilising different formats,
+    but the resulting colors may be unexpected due to the mismatch in color
+    formats.
 
 Constants
 ---------