Skip to content

Commit 2809b4f

Browse files
dhalbertdhalbert
committed
Merge branch 'master' into micropython-25ae98f-merge
2 parents e2e01ef + 617351a commit 2809b4f

File tree

71 files changed

+23466
-10920
lines changed

Some content is hidden

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

71 files changed

+23466
-10920
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+
*.zip binary
1516

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

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*.bin
88
*.map
99
*.hex
10-
!ports/nrf/**/bootloader/*.hex
10+
!ports/nrf/**/bootloader/**/*.hex
1111
*.dis
1212
*.exe
1313

@@ -58,4 +58,8 @@ TAGS
5858
#################
5959
*.orig
6060

61+
# Emacs backup files
62+
####################
63+
*~
64+
6165
*.DS_Store

‎.gitmodules

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
url = https://github.com/micropython/stm32lib
3838
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
3939
[submodule "atmel-samd/asf4"]
40-
path = ports/atmel-samd/asf4
41-
url = https://github.com/adafruit/asf4.git
42-
branch = circuitpython
40+
path = ports/atmel-samd/asf4
41+
url = https://github.com/adafruit/asf4.git
42+
branch = circuitpython
4343
[submodule "tools/usb_descriptor"]
4444
path = tools/usb_descriptor
4545
url = https://github.com/adafruit/usb_descriptor.git
@@ -70,6 +70,13 @@
7070
[submodule "ports/atmel-samd/peripherals"]
7171
path = ports/atmel-samd/peripherals
7272
url = https://github.com/adafruit/samd-peripherals.git
73+
[submodule "frozen/Adafruit_CircuitPython_Crickit"]
74+
path = frozen/Adafruit_CircuitPython_Crickit
75+
url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit
7376
[submodule "ports/nrf/nrfx"]
7477
path = ports/nrf/nrfx
7578
url = https://github.com/NordicSemiconductor/nrfx.git
79+
[submodule "lib/tinyusb"]
80+
path = lib/tinyusb
81+
url = https://github.com/hathach/tinyusb.git
82+
branch = develop

‎conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
"ports/nrf/hal",
118118
"ports/nrf/modules",
119119
"ports/nrf/nrfx",
120+
"ports/nrf/usb",
120121
"ports/pic16bit",
121122
"ports/qemu-arm",
122123
"ports/stm32",

‎docs/drivers.rst

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

192192
Adafruit SeeSaw <https://circuitpython.readthedocs.io/projects/seesaw/en/latest/>
193193
ADS1x15 Analog-to-Digital Converter <https://circuitpython.readthedocs.io/projects/ads1x15/en/latest/>
194+
Crickit Robotics Boards <<https://circuitpython.readthedocs.io/projects/crickit/en/latest/>
194195
DS2413 OneWire GPIO Expander <https://circuitpython.readthedocs.io/projects/ds2413/en/latest/>
195196
FocalTech Capacitive Touch <https://circuitpython.readthedocs.io/projects/focaltouch/en/latest/>
196197
MCP230xx GPIO Expander <https://circuitpython.readthedocs.io/projects/mcp230xx/en/latest/>
@@ -200,7 +201,6 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and `
200201
TLC59711 12 x 16-bit PWM Driver <https://circuitpython.readthedocs.io/projects/tlc59711/en/latest/>
201202
MPR121 Capacitive Touch Sensor <https://circuitpython.readthedocs.io/projects/mpr121/en/latest/>
202203

203-
204204
Miscellaneous
205205
----------------
206206

‎frozen/Adafruit_CircuitPython_BusDevice

‎frozen/Adafruit_CircuitPython_CircuitPlayground

‎frozen/Adafruit_CircuitPython_Crickit

‎frozen/Adafruit_CircuitPython_HID

‎frozen/Adafruit_CircuitPython_Motor

0 commit comments

Comments
 (0)