8000 Merge pull request #1404 from dhalbert/drivers.rst-typo · ihassin/circuitpython@7d17414 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7d17414

Browse files
authored
Merge pull request adafruit#1404 from dhalbert/drivers.rst-typo
Prepare for 3.1.2 release: Link typo in drivers.rst; update frozen modules; fix nRF builds
2 parents 3ace9ea + a5420a6 commit 7d17414

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+13268
-11276
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*.dxf binary
1313
*.mpy binary
1414
*.deb binary
15+
*.pdf binary
1516

1617
# These should also not be modified by git.
1718
tests/basics/string_cr_conversion.py -text

docs/drivers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and `
205205

206206
Adafruit SeeSaw <https://circuitpython.readthedocs.io/projects/seesaw/en/latest/>
207207
ADS1x15 Analog-to-Digital Converter <https://circuitpython.readthedocs.io/projects/ads1x15/en/latest/>
208-
Crickit Robotics Boards <<https://circuitpython.readthedocs.io/projects/crickit/en/latest/>
208+
Crickit Robotics Boards <https://circuitpython.readthedocs.io/projects/crickit/en/latest/>
209209
DS2413 OneWire GPIO Expander <https://circuitpython.readthedocs.io/projects/ds2413/en/latest/>
210210
FocalTech Capacitive Touch <https://circuitpython.readthedocs.io/projects/focaltouch/en/latest/>
211211
MCP230xx GPIO Expander <https://circuitpython.readthedocs.io/projects/mcp230xx/en/latest/>

ports/nrf/.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# Nordic files
2-
#####################
3-
drivers/bluetooth/s1*/
1+
# Old Nordic soft devices that don't allow redistribution
2+
#########################################################
3+
drivers/bluetooth/s132_nrf52_2.0.1/
44

55
# Build files
66
#####################
77
build-*/
8-

ports/nrf/boards/feather52840/README.md

Lines changed: 0 additions & 201 deletions
This file was deleted.

ports/nrf/boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld

Lines changed: 0 additions & 47 deletions
This file was deleted.

ports/nrf/boards/feather52840/board.c

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0