From 6c5075c20fc840b936ea4822457b3653c14643f2 Mon Sep 17 00:00:00 2001 From: Ethan Zonca Date: Sun, 7 Apr 2019 22:37:54 -0400 Subject: [PATCH] Increase version hash length, update USB descriptor --- Makefile | 2 +- src/usbd_desc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e7bdd5b..0149699 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ INCLUDES += $(USER_INCLUDES) DEFS = -D$(CORE) $(USER_DEFS) -D$(TARGET_DEVICE) # 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) # compile gcc flags diff --git a/src/usbd_desc.c b/src/usbd_desc.c index 66f1393..d41bd71 100644 --- a/src/usbd_desc.c +++ b/src/usbd_desc.c @@ -93,9 +93,9 @@ */ #define USBD_VID 0xad50 #define USBD_LANGID_STRING 1033 -#define USBD_MANUFACTURER_STRING "CANtact" +#define USBD_MANUFACTURER_STRING "Protofusion Labs" #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_INTERFACE_STRING_FS "CDC Interface"