djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supervisor.mk: Conditionally assign USB_DEVICES

Browse Source 
This restores the ability to remove CDC and/or MSC, at the price of
giving up the new automatic check that USB_DEVICES is correct.
Since devices have to have CDC and MSC to be "CircuitPython",
this is not a facility that is going to be used by any in-tree drivers.
This commit is contained in:
Jeff Epler 2020-06-24 09:44:45 -05:00 committed by GitHub
parent f232aef786
commit bf460ddf25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
supervisor/supervisor.mk
View File

@ -122,7 +122,7 @@ endif
ifeq ($(CIRCUITPY_USB_HID),1) ifeq ($(CIRCUITPY_USB_HID),1)
USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID
endif endif
USB_DEVICES := "$(USB_DEVICES_COMPUTED)" USB_DEVICES ?= "$(USB_DEVICES_COMPUTED)"
ifndef USB_HID_DEVICES ifndef USB_HID_DEVICES
USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD" USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD"