diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-07-16 19:36:40 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2018-07-16 19:36:40 -0400 |
| commit | 2809b4f9dd08dd1e83e87f1f4088ba22f3f66cd2 (patch) | |
| tree | e87027c60d5de0811f6213d087c677bc59295bd0 /.gitmodules | |
| parent | e2e01efa84d2ed46d004edf48076e4701accc176 (diff) | |
| parent | 617351aebc59e27a5f9a8a3b38032637a49f5432 (diff) | |
Merge branch 'master' into micropython-25ae98f-merge
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 388f9b4f6..1aa29a30b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,9 +37,9 @@ url = https://github.com/micropython/stm32lib branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0 [submodule "atmel-samd/asf4"] - path = ports/atmel-samd/asf4 - url = https://github.com/adafruit/asf4.git - branch = circuitpython + path = ports/atmel-samd/asf4 + url = https://github.com/adafruit/asf4.git + branch = circuitpython [submodule "tools/usb_descriptor"] path = tools/usb_descriptor url = https://github.com/adafruit/usb_descriptor.git @@ -70,6 +70,13 @@ [submodule "ports/atmel-samd/peripherals"] path = ports/atmel-samd/peripherals url = https://github.com/adafruit/samd-peripherals.git +[submodule "frozen/Adafruit_CircuitPython_Crickit"] + path = frozen/Adafruit_CircuitPython_Crickit + url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit [submodule "ports/nrf/nrfx"] path = ports/nrf/nrfx url = https://github.com/NordicSemiconductor/nrfx.git +[submodule "lib/tinyusb"] + path = lib/tinyusb + url = https://github.com/hathach/tinyusb.git + branch = develop |