Skip to content

Commit 64d457d

Browse files
dhalbertdhalbert
committed
bring bleio PR up to date
2 parents 4bc24c4 + 283e072 commit 64d457d

78 files changed

Lines changed: 11917 additions & 461 deletions

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit
7676
[submodule "ports/nrf/nrfx"]
7777
path = ports/nrf/nrfx
78-
url = https://github.com/NordicSemiconductor/nrfx.git
78+
url = https://github.com/adafruit/nrfx.git
7979
[submodule "lib/tinyusb"]
8080
path = lib/tinyusb
8181
url = https://github.com/hathach/tinyusb.git

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ git:
2121
# that SDK is shortest and add it there. In the case of major re-organizations,
2222
# just try to make the builds "about equal in run time"
2323
env:
24-
- TRAVIS_TESTS="unix docs translations" TRAVIS_BOARDS="feather_huzzah circuitplayground_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express" TRAVIS_SDK=arm:nrf:esp8266
24+
- TRAVIS_TESTS="unix docs translations" TRAVIS_BOARDS="feather_huzzah circuitplayground_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express makerdiary_nrf52840_mdk" TRAVIS_SDK=arm:nrf:esp8266
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
27-
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero" TRAVIS_SDK=arm
27+
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300" TRAVIS_SDK=arm
2828
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express" TRAVIS_SDK=arm
2929

3030
addons:

‎README.rst‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,21 @@ Supported Boards
3030
Designed for CircuitPython
3131
~~~~~~~~~~~~~~~~~~~~~~~~~~
3232

33+
**M0 Boards**
34+
3335
- `Adafruit CircuitPlayground Express <https://www.adafruit.com/product/3333>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart>`__)
3436
- `Adafruit Feather M0 Express <https://www.adafruit.com/product/3403>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-feather-m0-express-designed-for-circuit-python-circuitpython/kattni-circuitpython>`__)
35-
- `Adafruit Metro M0 Express <https://www.adafruit.com/product/3505>`_ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m0-express-designed-for-circuitpython/circuitpython>`__)
3637
- `Adafruit Gemma M0 <https://www.adafruit.com/product/3501>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-gemma-m0/circuitpython>`__)
38+
- `Adafruit Hallowing M0 Express <https://www.adafruit.com/product/3900>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-hallowing/circuitpython>`__)
3739
- `Adafruit ItsyBitsy M0 Express <https://www.adafruit.com/product/3727>`_ (`CircuitPython Guide <https://learn.adafruit.com/introducing-itsy-bitsy-m0/circuitpython>`__)
40+
- `Adafruit Metro M0 Express <https://www.adafruit.com/product/3505>`_ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m0-express-designed-for-circuitpython/circuitpython>`__)
3841
- `Adafruit Trinket M0 <https://www.adafruit.com/product/3500>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-trinket-m0-circuitpython-arduino/circuitpython>`__)
39-
- `Adafruit Metro M4 <https://www.adafruit.com/product/3382>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m4-express-featuring-atsamd51/overview>`__)
42+
43+
**M4 Boards**
44+
45+
- `Adafruit Feather M4 Express <https://www.adafruit.com/product/3857>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-feather-m4-express-atsamd51/circuitpython>`__)
46+
- `Adafruit ItsyBitsy M4 Express <https://www.adafruit.com/product/3800>`__ (`CircuitPython Guide <https://learn.adafruit.com/introducing-adafruit-itsybitsy-m4/circuitpython>`__)
47+
- `Adafruit Metro M4 Express <https://www.adafruit.com/product/3382>`__ (`CircuitPython Guide <https://learn.adafruit.com/adafruit-metro-m4-express-featuring-atsamd51/circuitpython>`__)
4048

4149
Other
4250
~~~~~
@@ -53,6 +61,12 @@ Other
5361
library <https://github.com/adafruit/Adafruit_CircuitPython_SD>`__)
5462
- `Arduino Zero <https://www.arduino.cc/en/Main/ArduinoBoardZero>`__
5563

64+
"Third-party" or "non-Adafruit" boards
65+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
66+
67+
- `Electronic Cats Meow Meow <https://electroniccats.com/gomeow/>`__
68+
69+
5670
Download
5771
--------
5872

‎conf.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
# directories to ignore when looking for source files.
8585
exclude_patterns = ["**/build*",
8686
".venv",
87+
".direnv",
8788
"docs/README.md",
8889
"drivers",
8990
"examples",

‎docs/library/usocket.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,16 @@ Constants
138138
Note that you don't need to specify these in a call to `usocket.socket()`,
139139
because `SOCK_STREAM` socket type automatically selects `IPPROTO_TCP`, and
140140
`SOCK_DGRAM` - `IPPROTO_UDP`. Thus, the only real use of these constants
141-
is as an argument to `setsockopt()`.
141+
is as an argument to `usocket.socket.setsockopt()`.
142142

143143
.. data:: usocket.SOL_*
144144

145-
Socket option levels (an argument to `setsockopt()`). The exact
145+
Socket option levels (an argument to `usocket.socket.setsockopt()`). The exact
146146
inventory depends on a ``MicroPython port``.
147147

148148
.. data:: usocket.SO_*
149149

150-
Socket options (an argument to `setsockopt()`). The exact
150+
Socket options (an argument to `usocket.socket.setsockopt()`). The exact
151151
inventory depends on a ``MicroPython port``.
152152

153153
Constants specific to WiPy:

‎drivers/wiznet5k/README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
This is the driver for the WIZnet5x00 series of Ethernet controllers.
2+
3+
Adapted for MicroPython.
4+
5+
Original source: https://github.com/Wiznet/W5500_EVB/tree/master/ioLibrary
6+
Taken on: 30 August 2014

0 commit comments

Comments
 (0)