Merge pull request #801 from dhalbert/2.x_cpx_freeze_express_hid

Freeze HID and Express into CPX 2.x firmware.
adafruit · May 3, 2018 · ffc66e9 · ffc66e9
2 parents 4dd9e0d + 0698219
commit ffc66e9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 4 deletions.
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
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
+0 −1		.readthedocs.yml
+4 −2		.travis.yml
+64 −7		README.rst
+1 −1		adafruit_bus_device/i2c_device.py
+0 −14		adafruit_bus_device/index.rst
+1 −1		adafruit_bus_device/spi_device.py
+ −		docs/_static/favicon.ico
+8 −0		docs/api.rst
+156 −0		docs/conf.py
+0 −0		docs/conf_old.py
+12 −0		docs/examples.rst
+45 −0		docs/index.rst
+17 −0		examples/read_register_i2c.py
+20 −0		examples/read_register_spi.py
+0 −0		.readthedocs.yml
+3 −2		.travis.yml
+61 −9		README.rst
+ −		docs/_static/favicon.ico
+0 −0		docs/api.rst
+11 −3		docs/conf.py
+8 −0		docs/examples.rst
+48 −0		docs/index.rst
+61 −0		examples/neopixel_simpletest.py
+24 −0		examples/pixel.py
+32 −12		neopixel.py