diff options
| author | Scott Shawcroft <scott@chickadee.tech> | 2016-10-05 11:07:29 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@chickadee.tech> | 2016-10-05 11:07:29 -0700 |
| commit | 7e08347d5c4dc0d250eb473f08469cef702fe4f9 (patch) | |
| tree | 31cb5afea2fce794518927a94f45bd19e256802c /atmel-samd/Makefile | |
| parent | 1fa4c20c27264e55b3442fe49bee2078a4516fa6 (diff) | |
atmel-samd: Support composite CDC and mass storage USB device.
Be careful to not use the flash file system while using mass storage
because both pieces of code attempting to change the fs can corrupt it.
Diffstat (limited to 'atmel-samd/Makefile')
| -rw-r--r-- | atmel-samd/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile index 1b6792646..96bd53ae0 100644 --- a/atmel-samd/Makefile +++ b/atmel-samd/Makefile @@ -34,9 +34,12 @@ INC += -I../lib/timeutils INC += -Icommon-hal/modules/ INC += -Iasf/common/boards/ INC += -Iasf/common/services/sleepmgr/ +INC += -Iasf/common/services/storage/ctrl_access/ INC += -Iasf/common/services/usb/ INC += -Iasf/common/services/usb/class/cdc/ INC += -Iasf/common/services/usb/class/cdc/device/ +INC += -Iasf/common/services/usb/class/msc/ +INC += -Iasf/common/services/usb/class/msc/device/ INC += -Iasf/common/services/usb/udc/ INC += -Iasf/common/utils INC += -Iasf/common2/services/delay/ @@ -77,8 +80,8 @@ CFLAGS_CORTEX_M0 = \ -fsingle-precision-constant \ -Wdouble-promotion \ -D__SAMD21G18A__ \ - -DUSB_DEVICE_PRODUCT_ID=0x024D \ - -DUSB_DEVICE_VENDOR_ID=0x4123 \ + -DUSB_DEVICE_PRODUCT_ID=$(USB_PID) \ + -DUSB_DEVICE_VENDOR_ID=$(USB_VID) \ -DBOARD=USER_BOARD \ -ffunction-sections \ -fdata-sections \ @@ -141,11 +144,14 @@ SRC_C = \ modutime.c \ mphalport.c \ pin_named_pins.c \ + rom_fs.c \ storage.c \ uart.c \ asf/common/services/sleepmgr/samd/sleepmgr.c \ + asf/common/services/storage/ctrl_access/ctrl_access.c \ asf/common/services/usb/class/cdc/device/udi_cdc.c \ - asf/common/services/usb/class/cdc/device/udi_cdc_desc.c \ + asf/common/services/usb/class/composite/device/udi_composite_desc.c \ + asf/common/services/usb/class/msc/device/udi_msc.c \ asf/common/services/usb/udc/udc.c \ asf/common/utils/interrupt/interrupt_sam_nvic.c \ asf/common2/services/delay/sam0/systick_counter.c \ |