Skip to content

Prepare for 3.1.2 release: Link typo in drivers.rst; update frozen modules; fix nRF builds #1404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*.dxf binary
*.mpy binary
*.deb binary
*.pdf binary

# These should also not be modified by git.
tests/basics/string_cr_conversion.py -text
Expand Down
2 changes: 1 addition & 1 deletion docs/drivers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and `

Adafruit SeeSaw <https://circuitpython.readthedocs.io/projects/seesaw/en/latest/>
ADS1x15 Analog-to-Digital Converter <https://circuitpython.readthedocs.io/projects/ads1x15/en/latest/>
Crickit Robotics Boards <<https://circuitpython.readthedocs.io/projects/crickit/en/latest/>
Crickit Robotics Boards <https://circuitpython.readthedocs.io/projects/crickit/en/latest/>
DS2413 OneWire GPIO Expander <https://circuitpython.readthedocs.io/projects/ds2413/en/latest/>
FocalTech Capacitive Touch <https://circuitpython.readthedocs.io/projects/focaltouch/en/latest/>
MCP230xx GPIO Expander <https://circuitpython.readthedocs.io/projects/mcp230xx/en/latest/>
Expand Down
2 changes: 1 addition & 1 deletion frozen/Adafruit_CircuitPython_Crickit
2 changes: 1 addition & 1 deletion frozen/Adafruit_CircuitPython_Thermistor
7 changes: 3 additions & 4 deletions ports/nrf/.gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Nordic files
#####################
drivers/bluetooth/s1*/
# Old Nordic soft devices that don't allow redistribution
#########################################################
drivers/bluetooth/s132_nrf52_2.0.1/

# Build files
#####################
build-*/

201 changes: 0 additions & 201 deletions ports/nrf/boards/feather52840/README.md

This file was deleted.

47 changes: 0 additions & 47 deletions ports/nrf/boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld

This file was deleted.

44 changes: 0 additions & 44 deletions ports/nrf/boards/feather52840/board.c

This file was deleted.

Loading