diff options
| author | Damien George | 2014-03-30 00:00:15 +0000 |
|---|---|---|
| committer | Damien George | 2014-03-30 00:00:15 +0000 |
| commit | 038df4318362325b5b6b77f7582fb6373a240f3c (patch) | |
| tree | 412143786f23fc67681f44f0673ee72f2a6a7f0d /stmhal/Makefile | |
| parent | d40d8f1e168c5bc3cf52f51d9592425574e7e6a9 (diff) | |
stmhal: Implement selector for USB device mode; improve boot up.
Can now choose at boot up whether the USB device is CDC+MSC or CDC+HID.
Choice is made by an option in boot.py, with default being CDC+MSC.
HID+MSC is not currently supported, but should be easy to implement.
Boot up now has ability to change the reset mode: hold down USR switch
while booting and LEDs will count from 1 to 7 to indicate the boot mode.
Release USR when correct mode is selected. Current modes are 1 (normal
boot), 2 (safe mode), 3 (reset FS mode).
Diffstat (limited to 'stmhal/Makefile')
| -rw-r--r-- | stmhal/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile index b4169e3d6..67c1ebcb4 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -21,7 +21,7 @@ INC += -I$(PY_SRC) INC += -I$(CMSIS_DIR)/inc INC += -I$(CMSIS_DIR)/devinc INC += -I$(HAL_DIR)/inc -INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/cdc_msc/inc +INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/cdc_msc_hid/inc #INC += -I$(USBHOST_DIR) INC += -I$(FATFS_DIR)/src #INC += -I$(CC3K_DIR) @@ -135,10 +135,10 @@ SRC_USBDEV = $(addprefix $(USBDEV_DIR)/,\ core/src/usbd_core.c \ core/src/usbd_ctlreq.c \ core/src/usbd_ioreq.c \ - class/cdc_msc/src/usbd_cdc_msc.c \ - class/cdc_msc/src/usbd_msc_bot.c \ - class/cdc_msc/src/usbd_msc_scsi.c \ - class/cdc_msc/src/usbd_msc_data.c \ + class/cdc_msc_hid/src/usbd_cdc_msc_hid.c \ + class/cdc_msc_hid/src/usbd_msc_bot.c \ + class/cdc_msc_hid/src/usbd_msc_scsi.c \ + class/cdc_msc_hid/src/usbd_msc_data.c \ ) # class/cdc/src/usbd_cdc.c \ |