diff options
| author | Kattni <kattni@adafruit.com> | 2018-05-03 17:41:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 17:41:57 -0400 |
| commit | ffc66e9892328a68d7f7f9ca4ad6cd7a67c16892 (patch) | |
| tree | d74f2669326d9949027d35cf7fc2a2270fa488c0 | |
| parent | 4dd9e0da2c4a72b400abf8e086b331626eaeabc4 (diff) | |
| parent | 06982194587e0f53d3730b32985f489df6a4a529 (diff) | |
Merge pull request #801 from dhalbert/2.x_cpx_freeze_express_hid
Freeze HID and Express into CPX 2.x firmware.
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | atmel-samd/boards/circuitplayground_express/mpconfigboard.mk | 2 | ||||
| m--------- | frozen/Adafruit_CircuitPython_BusDevice | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_CircuitPlayground | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_HID | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_LIS3DH | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_NeoPixel | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_Thermistor | 0 |
8 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index ef87dd1ba..d3c312c6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,3 +32,9 @@ [submodule "tools/python-semver"] path = tools/python-semver url = https://github.com/k-bx/python-semver.git +[submodule "frozen/Adafruit_CircuitPython_CircuitPlayground"] + path = frozen/Adafruit_CircuitPython_CircuitPlayground + url = https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground.git +[submodule "frozen/Adafruit_CircuitPython_HID"] + path = frozen/Adafruit_CircuitPython_HID + url = https://github.com/adafruit/Adafruit_CircuitPython_HID.git diff --git a/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk index 9a6157ee7..9bfffdf66 100644 --- a/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk +++ b/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk @@ -8,6 +8,8 @@ CHIP_VARIANT = SAMD21G18A # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice -Subproject 9a49ca04e3754be246524e57f8c1810c76be594 +Subproject de2d0d33cace54532467e411128521dfc8d253c diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground new file mode 160000 +Subproject a669915237545638c64f89400f368a91c408cd5 diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID new file mode 160000 +Subproject 90e4ca931a991718985e655bdcd527c1b0543f5 diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH -Subproject 74afff3ff912c9711d207671b8b9068358eaa0d +Subproject d5491cded0d12716ceb1111ca4c4431111a22df diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel -Subproject 8e1e5bbb86e03d539103c6d73ccac0cb27711b7 +Subproject e9f50cb6678a1684591ee021b95a3c4b51786fe diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor -Subproject 6c281ed26a2b38060e6a8c37c16f3bf6345cec2 +Subproject 00f4ebca6c740b76c1c464f83d514ac20b0600e |