Increase version hash length, update USB descriptor

This commit is contained in:
Ethan Zonca 2019-04-07 22:37:54 -04:00
parent adbbb7bf1d
commit 6c5075c20f
2 changed files with 3 additions and 3 deletions

View File

@ -86,7 +86,7 @@ INCLUDES += $(USER_INCLUDES)
DEFS = -D$(CORE) $(USER_DEFS) -D$(TARGET_DEVICE) DEFS = -D$(CORE) $(USER_DEFS) -D$(TARGET_DEVICE)
# Get git version and dirty flag # Get git version and dirty flag
GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags)
GIT_REMOTE := $(shell git config --get remote.origin.url) GIT_REMOTE := $(shell git config --get remote.origin.url)
# compile gcc flags # compile gcc flags

View File

@ -93,9 +93,9 @@
*/ */
#define USBD_VID 0xad50 #define USBD_VID 0xad50
#define USBD_LANGID_STRING 1033 #define USBD_LANGID_STRING 1033
#define USBD_MANUFACTURER_STRING "CANtact" #define USBD_MANUFACTURER_STRING "Protofusion Labs"
#define USBD_PID_FS 0x60c4 #define USBD_PID_FS 0x60c4
#define USBD_PRODUCT_STRING_FS "CANtact" " " GIT_VERSION " " GIT_REMOTE #define USBD_PRODUCT_STRING_FS "CANable" " " GIT_VERSION " " GIT_REMOTE
#define USBD_CONFIGURATION_STRING_FS "CDC Config" #define USBD_CONFIGURATION_STRING_FS "CDC Config"
#define USBD_INTERFACE_STRING_FS "CDC Interface" #define USBD_INTERFACE_STRING_FS "CDC Interface"