From 9dc33ad54553492319e3eba8025e3cf0086d14db Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Tue, 23 Oct 2018 23:23:46 -0700 Subject: [PATCH] bake patch: display correct ODrive version in USB descriptor --- ...ect-ODrive-version-in-USB-descriptor.patch | 41 ------------------- Firmware/Board/v3/Src/usbd_desc.c | 8 ++-- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 Firmware/Board/v3/0001-display-correct-ODrive-version-in-USB-descriptor.patch diff --git a/Firmware/Board/v3/0001-display-correct-ODrive-version-in-USB-descriptor.patch b/Firmware/Board/v3/0001-display-correct-ODrive-version-in-USB-descriptor.patch deleted file mode 100644 index 0b031242..00000000 --- a/Firmware/Board/v3/0001-display-correct-ODrive-version-in-USB-descriptor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b7ea3f500fbfc187a0a7112282ae6b1eee4555d0 Mon Sep 17 00:00:00 2001 -From: Samuel Sadok -Date: Tue, 13 Mar 2018 20:05:07 -0700 -Subject: [PATCH] display correct ODrive version in USB descriptor - ---- - Firmware/Board/v3/Src/usbd_desc.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Firmware/Board/v3/Src/usbd_desc.c b/Firmware/Board/v3/Src/usbd_desc.c -index 94dc49b..37b4302 100644 ---- a/Firmware/Board/v3/Src/usbd_desc.c -+++ b/Firmware/Board/v3/Src/usbd_desc.c -@@ -96,7 +96,9 @@ - #define USBD_LANGID_STRING 1033 - #define USBD_MANUFACTURER_STRING "ODrive Robotics" - #define USBD_PID_FS 0x0D32 --#define USBD_PRODUCT_STRING_FS "ODrive v3.3" -+#define USBD_PRODUCT_XSTR(s) USBD_PRODUCT_STR(s) -+#define USBD_PRODUCT_STR(s) #s -+#define USBD_PRODUCT_STRING_FS ODrive version HW_VERSION_MAJOR.HW_VERSION_MINOR - #define USBD_SERIALNUMBER_STRING_FS "000000000001" - #define USBD_CONFIGURATION_STRING_FS "CDC Config" - #define USBD_INTERFACE_STRING_FS "CDC Interface" -@@ -299,11 +301,11 @@ uint8_t * USBD_FS_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length - { - if(speed == 0) - { -- USBD_GetString((uint8_t *)USBD_PRODUCT_STRING_FS, USBD_StrDesc, length); -+ USBD_GetString((uint8_t *)USBD_PRODUCT_XSTR(USBD_PRODUCT_STRING_FS), USBD_StrDesc, length); - } - else - { -- USBD_GetString((uint8_t *)USBD_PRODUCT_STRING_FS, USBD_StrDesc, length); -+ USBD_GetString((uint8_t *)USBD_PRODUCT_XSTR(USBD_PRODUCT_STRING_FS), USBD_StrDesc, length); - } - return USBD_StrDesc; - } --- -2.16.2 - diff --git a/Firmware/Board/v3/Src/usbd_desc.c b/Firmware/Board/v3/Src/usbd_desc.c index 2e139e50..973b0ae2 100644 --- a/Firmware/Board/v3/Src/usbd_desc.c +++ b/Firmware/Board/v3/Src/usbd_desc.c @@ -95,7 +95,9 @@ #define USBD_LANGID_STRING 1033 #define USBD_MANUFACTURER_STRING "ODrive Robotics" #define USBD_PID_FS 0x0D32 -#define USBD_PRODUCT_STRING_FS "ODrive v3.3" +#define USBD_PRODUCT_XSTR(s) USBD_PRODUCT_STR(s) +#define USBD_PRODUCT_STR(s) #s +#define USBD_PRODUCT_STRING_FS ODrive version HW_VERSION_MAJOR.HW_VERSION_MINOR #define USBD_SERIALNUMBER_STRING_FS "000000000001" #define USBD_CONFIGURATION_STRING_FS "CDC Config" #define USBD_INTERFACE_STRING_FS "CDC Interface" @@ -342,11 +344,11 @@ uint8_t * USBD_FS_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length { if(speed == 0) { - USBD_GetString((uint8_t *)USBD_PRODUCT_STRING_FS, USBD_StrDesc, length); + USBD_GetString((uint8_t *)USBD_PRODUCT_XSTR(USBD_PRODUCT_STRING_FS), USBD_StrDesc, length); } else { - USBD_GetString((uint8_t *)USBD_PRODUCT_STRING_FS, USBD_StrDesc, length); + USBD_GetString((uint8_t *)USBD_PRODUCT_XSTR(USBD_PRODUCT_STRING_FS), USBD_StrDesc, length); } return USBD_StrDesc; }