Merge pull request #5329 from dhalbert/prox-trinkey-squeeze

dhalbert · web-flow · commit f5bb53e1121b · 2021-09-10T18:17:42.000-04:00
proxlight: Freeze adafruit_apds9960 instead of adafruit_hid; enable usb_midi
diff --git a/.gitmodules b/.gitmodules
@@ -191,3 +191,6 @@
 [submodule "lib/quirc"]
 	path = lib/quirc
 	url = https://github.com/adafruit/quirc.git
+[submodule "frozen/Adafruit_CircuitPython_APDS9960"]
+	path = frozen/Adafruit_CircuitPython_APDS9960
+	url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960
diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960
@@ -0,0 +1 @@
+Subproject commit ee411d34dfa2fb70a35aa99945eca77f16456619
diff --git a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk
@@ -19,7 +19,6 @@ CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
-CIRCUITPY_USB_MIDI = 0
 
 CIRCUITPY_GETPASS = 0
 CIRCUITPY_TRACEBACK = 0
@@ -28,5 +27,5 @@ CIRCUITPY_PIXELBUF = 1
 CIRCUITPY_BUSDEVICE = 1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_APDS9960
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
