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

proxlight: Freeze adafruit_apds9960 instead of adafruit_hid; enable usb_midi
This commit is contained in:
Dan Halbert 2021-09-10 18:17:42 -04:00 committed by GitHub
commit f5bb53e112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

3
.gitmodules vendored
View File

@ -191,3 +191,6 @@
[submodule "lib/quirc"] [submodule "lib/quirc"]
path = lib/quirc path = lib/quirc
url = https://github.com/adafruit/quirc.git 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

@ -0,0 +1 @@
Subproject commit ee411d34dfa2fb70a35aa99945eca77f16456619

View File

@ -19,7 +19,6 @@ CIRCUITPY_PULSEIO = 0
CIRCUITPY_PWMIO = 0 CIRCUITPY_PWMIO = 0
CIRCUITPY_ROTARYIO = 0 CIRCUITPY_ROTARYIO = 0
CIRCUITPY_RTC = 0 CIRCUITPY_RTC = 0
CIRCUITPY_USB_MIDI = 0
CIRCUITPY_GETPASS = 0 CIRCUITPY_GETPASS = 0
CIRCUITPY_TRACEBACK = 0 CIRCUITPY_TRACEBACK = 0
@ -28,5 +27,5 @@ CIRCUITPY_PIXELBUF = 1
CIRCUITPY_BUSDEVICE = 1 CIRCUITPY_BUSDEVICE = 1
# Include these Python libraries in firmware. # 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 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel