fix compiler warnings - USBD VCP strings resulting in 'condition has …

…identical branches'
emuflight · Feb 23, 2024 · 656b98c · 656b98c
1 parent 8be0288
commit 656b98c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/msc/usbd_msc_desc.c b/src/main/msc/usbd_msc_desc.c
@@ -67,8 +67,10 @@
 #define USBD_MANUFACTURER_STRING   "STMicroelectronics"
 #define USBD_PRODUCT_HS_STRING        "Mass Storage in HS Mode"
 #define USBD_PRODUCT_FS_STRING        "Mass Storage in FS Mode"
-#define USBD_CONFIGURATION_HS_STRING  "MSC Config"
-#define USBD_INTERFACE_HS_STRING      "MSC Interface"
+#define USBD_CONFIGURATION_HS_STRING  "MSC Config in HS Mode"
+#define USBD_INTERFACE_HS_STRING      "MSC Interface in HS Mode"
+#define USBD_CONFIGURATION_FS_STRING  "MSC Config in FS Mode"
+#define USBD_INTERFACE_FS_STRING      "MSC Interface in FS Mode"
 /**
   * @}
   */

diff --git a/src/main/vcp_hal/usbd_desc.c b/src/main/vcp_hal/usbd_desc.c
@@ -66,10 +66,10 @@
 #define USBD_MANUFACTURER_STRING      FC_FIRMWARE_NAME
 #define USBD_PRODUCT_HS_STRING        "STM32 Virtual ComPort in HS Mode"
 #define USBD_PRODUCT_FS_STRING        "STM32 Virtual ComPort in FS Mode"
-#define USBD_CONFIGURATION_HS_STRING  "VCP Config"
-#define USBD_INTERFACE_HS_STRING      "VCP Interface"
-#define USBD_CONFIGURATION_FS_STRING  "VCP Config"
-#define USBD_INTERFACE_FS_STRING      "VCP Interface"
+#define USBD_CONFIGURATION_HS_STRING  "VCP Config in HS Mode"
+#define USBD_INTERFACE_HS_STRING      "VCP Interface in HS Mode"
+#define USBD_CONFIGURATION_FS_STRING  "VCP Config in FS Mode"
+#define USBD_INTERFACE_FS_STRING      "VCP Interface in FS Mode"
 
 /* Private macro -------------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/