djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,582 Commits 21 Branches 274 Tags 785 MiB
7998a7696d
Commit Graph

1484 Commits

Author SHA1 Message Date
Scott Shawcroft
df84da5913
Stub out serial_write as well 2018-12-07 09:32:37 -08:00
Scott Shawcroft
808ca676b6
Fix unix 2018-12-06 17:12:30 -08:00
Scott Shawcroft
332ea8853f
Macro guard VDDH inclusion. 2018-12-06 16:38:14 -08:00
Scott Shawcroft
817766acdc
Use the stub for ESP8266 as well. 2018-12-06 15:47:16 -08:00
Scott Shawcroft
6ef8639971
Rework safe mode and have heap overwrite trigger it. 
This creates a common safe mode mechanic that ports can share.
As a result, the nRF52 now has safe mode support as well.

The common safe mode adds a 700ms delay at startup where a reset
during that window will cause a reset into safe mode. This window
is designated by a yellow status pixel and flashing the single led
three times.

A couple NeoPixel fixes are included for the nRF52 as well.

Fixes #1034. Fixes #990. Fixes #615.
 2018-12-06 14:24:20 -08:00
Dan Halbert
125901e4e2 Merge remote-tracking branch 'adafruit/master' into bleio-rev 2018-12-06 12:41:38 -05:00
Scott Shawcroft
7ad2e6ace3
Add stack validity check and raise an error when it happens. 
The backtrace cannot be given because it relies on the validity
of the qstr data structures on the heap which may have been
corrupted.

In fact, it still can crash hard when the bytecode itself is
overwritten. To fix, we'd need a way to skip gathering the
backtrace completely.

This also increases the default stack size on M4s so it can
accomodate the stack needed by ASF4s nvm API.
 2018-12-04 23:26:04 -08:00
Scott Shawcroft
f59c3bd726
Add flag comment 2018-12-04 18:22:23 -08:00
Scott Shawcroft
b25bf062fb
Add correct flash chip for Particle Mesh boards 2018-12-04 18:20:51 -08:00
Scott Shawcroft
3f5d917b39
Update submodules to merge commits 2018-12-04 18:20:51 -08:00
Scott Shawcroft
15c1fc873c
Add particle boards, fix cp32 and try to speed up atmel build 2018-12-04 18:20:48 -08:00
Dan Halbert
63cd9209f1 allow KeyboardInterrupt on UART read; fix nrf UART pin claiming; rename feather 52840 UART pins 2018-12-04 15:05:39 -05:00
Dan Halbert
7f6da78be3
Merge pull request #1344 from bwshockley/master 
Add Mini SAM M4 board.
 2018-12-03 17:37:23 -05:00
Dan Halbert
80db2cec99 UART changes: timeout in secs, write bytes, etc. 2018-12-03 12:04:32 -05:00
ShawnHymel
3d597aae92 Added MKR Zero board definition. 2018-12-02 18:07:19 -06:00
Scott Shawcroft
9aebe2f1ef
Merge branch 'master' into master 2018-11-30 20:49:55 -08:00
Scott Shawcroft
c55183f71a
Merge remote-tracking branch 'adafruit/master' into gc_rev_b 2018-11-30 15:09:15 -08:00
Scott Shawcroft
48928d4b25
Auto build and a couple pin fixes 2018-11-30 15:08:06 -08:00
Scott Shawcroft
3fa8796668
Merge remote-tracking branch 'adafruit/master' into mini_sam 2018-11-30 15:01:03 -08:00
Scott Shawcroft
77760090e2
Fix up spi flash define 2018-11-30 14:55:06 -08:00
Scott Shawcroft
95e0309263
Merge remote-tracking branch 'adafruit/master' into mini_sam 2018-11-30 14:40:01 -08:00
jimblom
09316b35d7 remove non-broken-out nrf pins. re-organize pins.c list. 2018-11-30 14:58:36 -07:00
Scott Shawcroft
6e15ab6385
Stop ignoring SD hex files and improve the error when its missing. 2018-11-30 13:26:12 -08:00
Scott Shawcroft
df18d22a93
Capture stderr as well and work on nRF build 2018-11-30 12:59:05 -08:00
jimblom
f67814fc97 Adding SparkFun nRF52840 Mini board support. 2018-11-30 13:57:22 -07:00
Scott Shawcroft
cf70dc4f1c
Fix BLE build 2018-11-30 11:53:33 -08:00
Scott Shawcroft
56345ff997
A few tweaks based on review feedback 2018-11-30 10:58:27 -08:00
Scott Shawcroft
9d07e95351
Add support for adding release info into adafruit/circuitpython-org 
This also changes the build script to python with better output.
 2018-11-30 00:30:57 -08:00
Scott Shawcroft
c47c495aca
Merge pull request #1329 from notro/oserror_errno 
Support OSError subclasses and attributes
 2018-11-27 22:35:54 -08:00
Scott Shawcroft
913b513929
Merge pull request #1357 from ElectronicCats/add-electroniccats-catwan-usbstick 
Added board Electronic Cats CatWAN USB Stick
 2018-11-27 11:58:26 -08:00
Scott Shawcroft
60480ff4ed
Merge pull request #1351 from jepler/issue1307-ujson 
json: enable on nrf boards and "large flash" M4 samd boards
 2018-11-27 11:29:29 -08:00
Scott Shawcroft
d446d328d8
Fix QSPI on Feather nRF52840 
We were writing with quad page program including the address (0x38)
which is unsupported by the GD25Q16C but it is supported by the
flash on the DK. So, we use the single address, quad data command
(0x32).
 2018-11-27 00:13:24 -08:00
Dan Halbert
3164b16196 WIP: debug; add hash and __eq__ to UUID 2018-11-26 21:09:17 -05:00
sabas1080
1da2425612 Add Electronic Cats CatWAN USB Stick 2018-11-26 14:39:58 -06:00
Dan Halbert
6fb7590280 Merge remote-tracking branch 'adafruit/master' into bleio-rev 2018-11-26 10:16:29 -05:00
Scott Shawcroft
15eeac5d4b
A few fixes for nRF52840 feather QSPI and neopixel 2018-11-23 14:22:07 -08:00
Scott Shawcroft
324301e3bc
Update tinyusb to include control fixes. 2018-11-23 13:28:10 -08:00
Jeff Epler
52fd151c9c ports/nrf: enable json module on nrf boards generally 2018-11-22 10:35:57 -06:00
Jeff Epler
78972cc879 ports/atmel-samd: enable json module on M4 boards with lots of flash 2018-11-22 10:35:44 -06:00
Dan Halbert
5fe746f643 Latest Feather nRF52840 pin revisions 2018-11-21 19:46:49 -05:00
Dan Halbert
1763ffe245 More UUID work; use mp_raise for exceptions 2018-11-20 23:04:58 -05:00
Benjamin Shockley
69eb2efced
Update devices.h 2018-11-20 13:21:43 -06:00
Scott Shawcroft
7d1a62e4ba
Update for Grand Central Rev B 2018-11-20 10:54:13 -08:00
Benjamin Shockley
c344d48840
Update devices.h 2018-11-20 12:44:12 -06:00
Dan Halbert
31cc71f7fb WIP: bleio revisions 2018-11-20 09:36:45 -05:00
Benjamin Shockley
acb9bd7618 Cleanup for Mini SAM M4 Only 
Remvoed older files and cleaned up repository to reflect changes for Mini SAM M4.
 2018-11-16 09:46:08 -06:00
Dan Halbert
11de8fdca7 merge 3.x swap of /lib and .frozen; update frozen libs 2018-11-15 15:00:23 -05:00
Scott Shawcroft
b67c53edfa
Factor out of external flash as well. 
Plus some cleanup.

Fixes #1324
 2018-11-14 18:30:47 -08:00
Scott Shawcroft
87ddd64481
Factor out fake partition 2018-11-14 17:59:11 -08:00
Scott Shawcroft
47212ee31e
start debug 2018-11-14 17:21:48 -08:00
Noralf Trønnes
704d0c606b samd51: Support more uerrno errno values 
Use the default MICROPY_PY_UERRNO_LIST to give libraries access to all the errno values.
 2018-11-13 22:07:05 +01:00
Dan Halbert
f190bb2c26
Merge pull request #1332 from tannewt/clear_trellis_neopixels 
Clear Trellis NeoPixels on board reset.
 2018-11-13 15:03:25 -05:00
Scott Shawcroft
4ae4cc11e0
Clear Trellis NeoPixels on board reset. 
This makes it easier to change code in cases where the pixels may
cause a brownout.
 2018-11-13 11:27:18 -08:00
Scott Shawcroft
a3a690dc01
Add pragma to ensure neopixel_write is always -Os 2018-11-13 10:56:00 -08:00
Scott Shawcroft
ed9db80760
Switch SAMD51 back to -Os 
It messes up neopixel timing otherwise.

Fixes #1326
 2018-11-13 10:43:18 -08:00
Scott Shawcroft
355abc835e
Fix output overflow and make help translatable 2018-11-09 16:41:08 -08:00
Scott Shawcroft
43f7ca7985
Incorporate feedback: 
* Clean up board defines.
* Add flush on eject and stay ejected.
* Swith back to NONE protocol for CDC.
 2018-11-09 11:33:56 -08:00
Scott Shawcroft
688f0e388b
Update MKR1300 board definition too 2018-11-09 00:49:02 -08:00
Scott Shawcroft
be6b49c712
Add back internal flash header and slim it down. 2018-11-09 00:27:18 -08:00
Scott Shawcroft
9d91111b1b
Move atmel-samd to tinyusb and support nRF flash. 
This started while adding USB MIDI support (and descriptor support is
in this change.) When seeing that I'd have to implement the MIDI class
logic twice, once for atmel-samd and once for nrf, I decided to refactor
the USB stack so its shared across ports. This has led to a number of
changes that remove items from the ports folder and move them into
supervisor.

Furthermore, we had external SPI flash support for nrf pending so I
factored out the connection between the usb stack and the flash API as
well. This PR also includes the QSPI support for nRF.
 2018-11-08 17:25:30 -08:00
Dan Halbert
64d457dad9 bring bleio PR up to date 2018-11-07 14:12:22 -05:00
Scott Shawcroft
f24c225664
Merge pull request #1312 from dhalbert/adafruit_nrfx 
Use adafruit/nrfx fork of NordicSemiconductor/nrfx
 2018-11-04 11:42:12 -08:00
Scott Shawcroft
6aca9762c9
Merge pull request #1313 from siddacious/master 
adding support for the CP32-M4
 2018-11-04 11:26:14 -08:00
Dan Halbert
a15ed0b912 Fix Trellis M4 DotStar pin assignments. 2018-11-04 00:07:42 -04:00
ATMakersBill
bd4188a092 adding changes to mpconfigboard.mk to reduce memory usage on CPX per @danh 2018-11-03 14:42:27 -04:00
ATMakersBill
4f2f571536 Adding the serial_bytes_available() method to the 3.x branch 2018-11-03 14:01:30 -04:00
Dan Halbert
4dfba2f8ac put .frozen before /lib in sys.path; update frozen libraries 2018-11-01 19:57:10 -04:00
Bryan Siepert
844b674a1e adding support for the CP32-M4 2018-11-01 09:42:48 -07:00
Dan Halbert
e203ce9ce5 Use adafruit/nrfx fork of NordicSemiconductor/nrfx 2018-10-31 23:18:59 -04:00
Bryan Siepert
dc82fd556b Updating devices.h to add new devices, fix a typo and address #1239 2018-10-31 01:54:09 -07:00
Dan Halbert
bd79c0c0de
Merge pull request #1295 from ElectronicCats/mkr1300 
Add board MKR1300 by Arduino
 2018-10-26 20:15:20 -04:00
Benjamin Shockley
aec39fd027 Updated to new D21G18 MCU 
Updated MIni SAM M0 to new D21G18A MCU to match layout/design of M4
 2018-10-26 12:09:59 -05:00
Nick Moore
bbf8334166 Fix build without network code 2018-10-25 13:14:27 +11:00
Nick Moore
f6482699a0 Merge remote-tracking branch 'origin/master' into circuitpython/nickzoic/703-wiznet-5500-native 2018-10-25 12:20:50 +11:00
Scott Shawcroft
dc9d338612
Merge pull request #1167 from notro/cpython_stdlib 
Support CPython standard library
 2018-10-24 12:57:41 -07:00
Noralf Trønnes
d882ff6328 samd51: Set stack size to 8k 
This is necessary in order to run unittest.
Heavy tests like those in the stdlib need 12-14k.
 2018-10-24 19:33:01 +02:00
Noralf Trønnes
1b86e5fc83 samd51: Enable functionality to support CPython stdlib 
This enables various things in order to support the CPython standard library.

MICROPY_PY_BUILTINS_NOTIMPLEMENTED:
Support NotImplemented for easy conversion of stdlib.
It doesn't do fallbacks though, only raises TypeError.

MICROPY_PY_COLLECTIONS_ORDEREDDICT:
collections.OrderedDict

MICROPY_PY_FUNCTION_ATTRS:
Support function.__name__ for use as key in the function attribute workaround.

MICROPY_PY_IO:
uio module: BytesIO, FileIO, StringIO, TextIOWrapper
Also add 'io' alias.

MICROPY_PY_REVERSE_SPECIAL_METHODS:
Support the __r*__ special methods.

MICROPY_PY_SYS_EXC_INFO:
sys.exc_info() used by unittest when collecting exceptions.

MICROPY_CPYTHON_COMPAT:
Some of the things it adds:

>>> object.__init__
<function>
>>> object.__new__
<function>
>>> object.__class__
<class 'type'>
>>> object().__class__
<class 'object'>
>>> object.__name__
'object'

>>> 'Hello'.encode()
b'Hello'
>>> b'Hello'.decode()
'Hello'

Named tuple field names from string:
namedtuple('Point', 'x y')
 2018-10-24 19:33:01 +02:00
Noralf Trønnes
cec9a69a15 samd51: Make errno, os, and time module aliases 
Add alias for uerrno so the user doesn't have to know about the
CircuitPython special names for the module.

Make os and time weak modules (aliases) making it possible to add
functionality to those modules written in python.

Example:
'import os' will now look in the path for an os module and if not found
it will import the builtin module. An os module written in python will
import the builtin module through its name prefixed with an underscore
(_os) following the C module naming practice in CPython.

Also right align the macro values to increase readability making it
easier to compare the values for samd21 and samd51. Even the longest
macro from py/mpconfig.h will fit with this alignment.
 2018-10-24 19:31:53 +02:00
Scott Shawcroft
554f82fe9b
Merge pull request #1286 from klardotsh/topic-nrf52840-mdk 
Add support for MakerDiary nRF52840 MDK board
 2018-10-22 17:47:14 -07:00
sabas1080
f0d7073a12 Add Arduino MKR1300 2018-10-22 19:38:24 -05:00
arturo182
4bc24c4f60 bleio: Fix errors after rebase 2018-10-21 17:15:27 +02:00
arturo182
eceb21a017 bleio: Don't register the services until needed 
Because of the very specific way nRF requires service registration
(characteristics can be added only to last added service), we would
have to write the Python code in a specific way. With this patch the
user has more freedom.
 2018-10-21 16:00:04 +02:00
arturo182
19fab4af5a bleio: Remove deep copy constructor for UUID 2018-10-21 15:59:50 +02:00
arturo182
b5e5805bb4 bleio: Remove redundant struct field 2018-10-21 15:59:46 +02:00
arturo182
c7b42d80b3 bleio: A bit of cleanup 2018-10-21 15:59:42 +02:00
arturo182
cf79316002 nrf: Fix ble uart using the new API 2018-10-21 15:59:36 +02:00
arturo182
d5a71a4b8a nrf: Move bluetooth driver to the 'bluetooth' folder 2018-10-21 15:55:25 +02:00
arturo182
17f13ecc2c nrf: Cleanup of the ble driver 
Moved the functions to classes that they belong to.
 2018-10-21 15:54:13 +02:00
arturo182
77eeecbfd9 nrf: BLE driver cleanup 2018-10-21 15:52:36 +02:00
arturo182
6545aa99a9 nrf: Remove the ble drv specific characteristic struct 2018-10-21 15:51:04 +02:00
arturo182
98aa8c5923 nrf: Remove the ble drv specific service struct 2018-10-21 15:51:01 +02:00
arturo182
3df7dea2cc nrf: Remove the ble drv specific advertisement data struct 2018-10-21 15:50:59 +02:00
arturo182
4b344812bf nrf: Remove the ble drv specific address struct 2018-10-21 15:50:56 +02:00
arturo182
3bd65fbae5 nrf: Move the Peripheral class to bleio as Device 
This was the last class from ubluepy and so that module is now gone.
The Device class offers both Peripheral and Central functionality.
See the inline docs for more info.
 2018-10-21 15:50:45 +02:00
arturo182
bda734223e nrf: Move the Service class from ubluepy to the shared bleio module 2018-10-21 15:43:51 +02:00
arturo182
cc78249226 nrf: Move the Characteristic class from ubluepy to the shared bleio module 2018-10-21 15:43:48 +02:00
arturo182
61bf4a16a7 nrf: Remove unused ubluepy classes 2018-10-21 15:43:39 +02:00
arturo182
1c6bf9a150 bleio: Move the Scanner class to a shared module 2018-10-21 15:43:29 +02:00
arturo182
7390dc7dab bleio: Move ScanEntry to shared module and add a new AdvertisementData class 2018-10-21 15:43:24 +02:00
arturo182
345334aaf1 bleio: Add a new Address class 
Use the new in the Adapter singleton.
 2018-10-21 15:43:21 +02:00
arturo182
d5f942a971 bleio: Add a AddressType enum-like class 2018-10-21 15:43:17 +02:00
arturo182
20b8d5169d nrf: Move the Descriptor class from ubluepy to the shared bleio module 2018-10-21 15:43:13 +02:00
arturo182
f4940c9aec nrf: Move the UUID class from ubluepy to the shared bleio module 
Also added a UUIDType enum-like class for determining UUID type.
 2018-10-21 15:43:08 +02:00
Josh Klar
aefabc5353
Update docs to reflect proper size of device 2018-10-20 03:29:20 -07:00
Josh Klar
4c75a60bd3
Declobber a DEFINE 2018-10-20 02:57:17 -07:00
Josh Klar
16ca9c8c7c
Makefile fixes and some docs 2018-10-20 02:43:13 -07:00
Josh Klar
3d7b96aeb1
Add board and pin defs for MakerDiary NRF52840 MDK 2018-10-20 02:43:12 -07:00
Benjamin Shockley
5d190a5615
Update mpconfigboard.h 
Corrected NVM size.
 2018-10-19 21:18:19 -05:00
Benjamin Shockley
548e6893cd
Create pins.c 2018-10-19 21:16:21 -05:00
Benjamin Shockley
88fd5d7daa
Create mpconfigboard.mk 2018-10-19 21:15:50 -05:00
Benjamin Shockley
1593f4e3a8
Create mpconfigboard.h 2018-10-19 21:14:46 -05:00
Benjamin Shockley
6d974593c7
Create board.c 2018-10-19 20:52:23 -05:00
Scott Shawcroft
b436666e85
Merge pull request #1272 from sajattack/battery 
add pin def for BAT
 2018-10-17 12:15:38 -07:00
Dan Halbert
298756eef8
Merge pull request #1280 from tannewt/precondition_dac 
Ramp values to and from a default value while active.
 2018-10-17 15:00:11 -04:00
Scott Shawcroft
8161178415
Merge pull request #1275 from ElectronicCats/board-meowmeow 
Added board Meow Meow by Electronic Cats
 2018-10-17 11:41:57 -07:00
Scott Shawcroft
4eb1fe18e5
Tweaks from feedback: 
* default_value is now quiescent_value
* Use step = -step format for sign switch
* Add note about analogout_reset being empty
 2018-10-17 11:31:08 -07:00
Scott Shawcroft
c209165d43
Ramp values to and from a default value while active. 
This reduces the popping sound on initial playback of an audio
sample.

The M4 DAC has a pop on startup that cannot be prevented. It also
does not allow readback so current values of the DAC are ignored.

Fixes #1090
 2018-10-16 16:23:29 -07:00
Paul Sajna
089e2cc099 remove BATTERY from itsybitsy 2018-10-16 14:55:21 -07:00
Scott Shawcroft
c69b67f453
Merge pull request #1277 from dhalbert/nrf-pulseout 
PulseOut working
 2018-10-16 10:19:55 -07:00
Dan Halbert
b3c7746a7f fix copyright notice 2018-10-16 11:09:37 -04:00
Dan Halbert
2262efc311 PulseOut working 2018-10-16 11:05:02 -04:00
Nick Moore
a15f3361aa add mechanism for timer ticks in NICs 2018-10-16 23:09:25 +11:00
sabas1080
c103a05579 Add board Meow Meow by Electronic Cats 
https://github.com/ElectronicCats/MeowMeow
 2018-10-15 19:17:04 -05:00
Paul Sajna
1447df3fa6 change BAT to BATTERY 2018-10-14 23:34:49 -07:00
Paul Sajna
f1028b5f96 add pin def for BAT 2018-10-13 15:53:22 -07:00
Dan Halbert
8b531f3fba
Merge pull request #1263 from tannewt/trellis_m4_revD 
Support rev D for the Trellis M4 Express
 2018-10-10 23:34:59 -04:00
Nick Moore
aab28748bb Merge remote-tracking branch 'origin/master' into circuitpython/nickzoic/703-wiznet-5500-native 2018-10-11 14:19:10 +11:00
Nick Moore
8d75c3d339 Changed to only build wiznet for {feather|metro}_m[04]_express 2018-10-11 13:42:26 +11:00
Scott Shawcroft
e5d2fae801
Merge pull request #1261 from jepler/esp8266-prebuilt-sdk 
esp8266/README: comment on the specific binary SDK used
 2018-10-10 12:03:12 -07:00
Scott Shawcroft
b5e26130d7
Support rev D for the Trellis M4 Express 2018-10-10 11:21:35 -07:00
Dan Halbert
8d58093328
Merge pull request #1259 from dhalbert/nrf-pwmout 
Allow variable freq PWMOut; use multiple channels if same freq
 2018-10-10 12:27:27 -04:00
Scott Shawcroft
df80ad8e6e
Merge pull request #1193 from ATMakersBill/master 
Add supervisor.runtime.serial_bytes_available so that input() can be used without blocking.
 2018-10-09 23:58:43 -07:00
Dan Halbert
ca737e6f7c Don't disable tempoarily in deinit(). 2018-10-09 21:23:47 -04:00
Jeff Epler
012cc466a4 esp8266/README: comment on the specific binary SDK used 2018-10-09 20:17:38 -05:00
Dan Halbert
91a88cf568 Allow variable freq PWMOut; use multiple channels if same freq 2018-10-09 20:52:55 -04:00
ATMakersBill
9f94712ad1 replacing change to input() with separate method to check for USB Serial input 2018-10-09 18:37:52 -04:00
Scott Shawcroft
a647ab83df
Merge remote-tracking branch 'adafruit/master' into mixer 2018-10-09 13:31:17 -07:00
Nick Moore
a60700b1c5 Get DHCP working ... 2018-10-09 16:28:30 +11:00
Nick Moore
6e624b9c6a Split wiznet.WIZNET5K off into its own file 2018-10-09 13:05:58 +11:00
Jerry Needell
fd0ea85549 add force_create to nrf filesystem_init() 2018-10-06 08:03:27 -04:00
Scott Shawcroft
2b0356c61f
Disable framebuf by default on express builds. 2018-10-05 15:19:09 -07:00
Scott Shawcroft
76008ce304
Introduce audioio.Mixer which can mix multiple audio samples 
to produce a single sample.

Only works with 16 bit samples on the M4.

Fixes #987
 2018-10-05 15:12:23 -07:00
hathach
21ddb6b9b9 fix tinyusb cdc issue 2018-10-05 21:37:16 +07:00
Benjamin Shockley
091c5106ef
Cleanup Files 2018-10-04 21:26:28 -05:00
Benjamin Shockley
62d316bffb
W25Q16JV IQ and IM 
Indicate the differences between IQ and IM with the 2 MiB version of the W25Q chip.
 2018-10-04 21:26:05 -05:00
Benjamin Shockley
2ef29c2cec
Changed FLASH DEVICE 
Changed the flash device to W25Q16JV_IM - the type actually used.
 2018-10-04 21:14:07 -05:00
Benjamin Shockley
f6b9f101dc
Added W25Q16JV_IM 
Added new flash module: W25Q16JV_IM
 2018-10-04 21:13:05 -05:00
Nick Moore
15b59bee1b change initialization method + mod_network names 2018-10-04 22:31:47 +10:00
Nick Moore
f9bda0ff93 Makefile & mpconfigport for atmel-samd with wiznet 2018-10-04 22:02:25 +10:00
Dan Halbert
6049776b26
Merge branch 'master' into nrf52_uart_io 2018-10-03 13:31:48 -04:00