diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-05-04 09:59:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 09:59:16 -0700 |
| commit | 034b189c75bf61323739722afdca4d656a56f7ad (patch) | |
| tree | 1adf0619ffd2f9ced1974de28bd2862839ba9822 | |
| parent | a8bd37f14d9e13c57a6cf73845353e8adbd7cdcb (diff) | |
| parent | 32363b801b6e602baaf7e4ef5a5bd429edb915c2 (diff) | |
Merge pull request #805 from dhalbert/3.0_cpx_freeze_hid_cpx
3.0: add CircuitPlayground and HID to CPX frozen modules
| -rw-r--r-- | .gitmodules | 6 | ||||
| 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 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk | 2 |
8 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index ec0b01e33..d7c7b511b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,9 @@ [submodule "ports/atmel-samd/freetouch"] path = ports/atmel-samd/freetouch url = https://github.com/adafruit/Adafruit_FreeTouch.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/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice -Subproject 39f28ed4e0e5a06fc33fd01c1efc8c52c4140f0 +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 fa00b61d1bde90c3cf9cce74388cb9717058b2b +Subproject d5491cded0d12716ceb1111ca4c4431111a22df diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel -Subproject 1142f1c7fdc232a46d74dd4f1946a5f462ae255 +Subproject e9f50cb6678a1684591ee021b95a3c4b51786fe diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor -Subproject 2d57c0ba9a09d6d30f0ae2b98aba9567c25e6fb +Subproject 00f4ebca6c740b76c1c464f83d514ac20b0600e diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk index 43ff3521d..4d6e32eb7 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk @@ -11,6 +11,8 @@ CHIP_FAMILY = samd21 # 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 |