Merge pull request #801 from dhalbert/2.x_cpx_freeze_express_hid

kattni · web-flow · commit ffc66e989232 · 2018-05-03T17:41:57.000-04:00
Freeze HID and Express into CPX 2.x firmware.
diff --git 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
@@ -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
@@ -1 +1 @@
-Subproject commit 9a49ca04e3754be246524e57f8c1810c76be5948
+Subproject commit de2d0d33cace54532467e411128521dfc8d253c3
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
@@ -0,0 +1 @@
+Subproject commit a669915237545638c64f89400f368a91c408cd5d
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
@@ -0,0 +1 @@
+Subproject commit 90e4ca931a991718985e655bdcd527c1b0543f55
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit 74afff3ff912c9711d207671b8b9068358eaa0d2
+Subproject commit d5491cded0d12716ceb1111ca4c4431111a22df6
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
@@ -1 +1 @@
-Subproject commit 8e1e5bbb86e03d539103c6d73ccac0cb27711b77
+Subproject commit e9f50cb6678a1684591ee021b95a3c4b51786fee
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
@@ -1 +1 @@
-Subproject commit 6c281ed26a2b38060e6a8c37c16f3bf6345cec2d
+Subproject commit 00f4ebca6c740b76c1c464f83d514ac20b0600e1
