fixed the conf file, still need to check over desc and main

rijwal · rijwal · commit 2f824596aff9 · 2025-11-18T22:06:57.000-08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,12 @@
     "--compile-commands-dir=build_fw_dev",
     // "--compile-commands-dir=build_fw_test",
     "--query-driver=/usr/local/bin/arm-none-eabi-gcc"
-  ]
+  ],
+  "files.associations": {
+    "usbd_def.h": "c",
+    "usbd_core.h": "c",
+    "usbd_conf.h": "c",
+    "usb_device.h": "c",
+    "__config": "c"
+  }
 }
diff --git a/firmware/hexray/BMS/CMakeLists.txt b/firmware/hexray/BMS/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CUBEMX_SRCS "${SHARED_EMBEDDED_DIR_CPP}/hw/usb/usbd_desc.c")
 set(CUBEMX_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/Inc"
         "${SHARED_HW_INCLUDE_DIR_CPP}/usb"
+        "${SHARED_HW_INCLUDE_DIR_CPP}/USB"
         "${CMAKE_CURRENT_SOURCE_DIR}/hw")
 
 set(JOBS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/jobs.cpp")
@@ -70,7 +71,7 @@ if ("${TARGET}" STREQUAL "binary")
             "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/BMS.ioc"
             "${CUBEMX_SRCS}"
             "${CUBEMX_INCLUDE_DIRS}"
-            FALSE
+            TRUE
             "${ARM_CORE}"
     )
 
diff --git a/firmware/hexray/BMS/hw/hw_usb_config.hpp b/firmware/hexray/BMS/hw/hw_usb_config.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define USBD_PRODUCT_STRING_HS "bms"
diff --git a/firmware/hexray/CRIT/CMakeLists.txt b/firmware/hexray/CRIT/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CUBEMX_SRCS "${SHARED_EMBEDDED_DIR_CPP}/hw/usb/usbd_desc.c")
 set(CUBEMX_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/Inc"
         "${SHARED_HW_INCLUDE_DIR_CPP}/usb"
+        "${SHARED_HW_INCLUDE_DIR_CPP}/USB"
         "${CMAKE_CURRENT_SOURCE_DIR}/hw")
 
 set(JOBS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/jobs.cpp")
@@ -69,7 +70,7 @@ if ("${TARGET}" STREQUAL "binary")
             "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/CRIT.ioc"
             "${CUBEMX_SRCS}"
             "${CUBEMX_INCLUDE_DIRS}"
-            FALSE
+            TRUE
             "${ARM_CORE}"
     )
 
diff --git a/firmware/hexray/CRIT/hw/hw_usb_config.hpp b/firmware/hexray/CRIT/hw/hw_usb_config.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define USBD_PRODUCT_STRING_HS "crit"
diff --git a/firmware/hexray/DAM/CMakeLists.txt b/firmware/hexray/DAM/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CUBEMX_SRCS "${SHARED_EMBEDDED_DIR_CPP}/hw/usb/usbd_desc.c")
 set(CUBEMX_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/Inc"
         "${SHARED_HW_INCLUDE_DIR_CPP}/usb"
+        "${SHARED_HW_INCLUDE_DIR_CPP}/USB"
         "${CMAKE_CURRENT_SOURCE_DIR}/hw")
 
 set(JOBS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/jobs.cpp")
@@ -69,7 +70,7 @@ if ("${TARGET}" STREQUAL "binary")
             "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/DAM.ioc"
             "${CUBEMX_SRCS}"
             "${CUBEMX_INCLUDE_DIRS}"
-            FALSE
+            TRUE
             "${ARM_CORE}"
     )
 
diff --git a/firmware/hexray/FSM/CMakeLists.txt b/firmware/hexray/FSM/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CUBEMX_SRCS "${SHARED_EMBEDDED_DIR_CPP}/hw/usb/usbd_desc.c")
 set(CUBEMX_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/Inc"
         "${SHARED_HW_INCLUDE_DIR_CPP}/usb"
+        "${SHARED_HW_INCLUDE_DIR_CPP}/USB"
         "${CMAKE_CURRENT_SOURCE_DIR}/hw")
 
 set(JOBS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/jobs.cpp")
@@ -69,7 +70,7 @@ if ("${TARGET}" STREQUAL "binary")
             "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/FSM.ioc"
             "${CUBEMX_SRCS}"
             "${CUBEMX_INCLUDE_DIRS}"
-            FALSE
+            TRUE
             "${ARM_CORE}"
     )
 
diff --git a/firmware/hexray/FSM/hw/hw_usb_config.hpp b/firmware/hexray/FSM/hw/hw_usb_config.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define USBD_PRODUCT_STRING_HS "fsm"
diff --git a/firmware/hexray/FSM/src/cubemx/FSM.ioc.md5 b/firmware/hexray/FSM/src/cubemx/FSM.ioc.md5
@@ -1 +1 @@
-24f2726de63b4722b40c701d9e657dbe
+532332e080dc479810983725e8acb38b
diff --git a/firmware/hexray/RSM/CMakeLists.txt b/firmware/hexray/RSM/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CUBEMX_SRCS "${SHARED_EMBEDDED_DIR_CPP}/hw/usb/usbd_desc.c")
 set(CUBEMX_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/Inc"
         "${SHARED_HW_INCLUDE_DIR_CPP}/usb"
+        "${SHARED_HW_INCLUDE_DIR_CPP}/USB"
         "${CMAKE_CURRENT_SOURCE_DIR}/hw")
 
 set(JOBS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/jobs.cpp")
@@ -69,7 +70,7 @@ if ("${TARGET}" STREQUAL "binary")
             "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/RSM.ioc"
             "${CUBEMX_SRCS}"
             "${CUBEMX_INCLUDE_DIRS}"
-            FALSE
+            TRUE
             "${ARM_CORE}"
     )
 
diff --git a/firmware/hexray/RSM/hw/hw_usb_config.hpp b/firmware/hexray/RSM/hw/hw_usb_config.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define USBD_PRODUCT_STRING_HS "rsm"
diff --git a/firmware/hexray/VC/CMakeLists.txt b/firmware/hexray/VC/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CUBEMX_SRCS "${SHARED_EMBEDDED_DIR_CPP}/hw/usb/usbd_desc.c")
 set(CUBEMX_INCLUDE_DIRS
         "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/Inc"
         "${SHARED_HW_INCLUDE_DIR_CPP}/usb"
+        "${SHARED_HW_INCLUDE_DIR_CPP}/USB"
         "${CMAKE_CURRENT_SOURCE_DIR}/hw")
 
 set(JOBS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/jobs.cpp")
@@ -68,7 +69,7 @@ if ("${TARGET}" STREQUAL "binary")
             "${CMAKE_CURRENT_SOURCE_DIR}/src/cubemx/VC.ioc"
             "${CUBEMX_SRCS}"
             "${CUBEMX_INCLUDE_DIRS}"
-            FALSE
+            TRUE
             "${ARM_CORE}"
     )
 
diff --git a/firmware/hexray/VC/hw/hw_usb_config.hpp b/firmware/hexray/VC/hw/hw_usb_config.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define USBD_PRODUCT_STRING_HS "vc"
diff --git a/firmware/quintuna/VC/src/cubemx/Src/usbd_conf.c b/firmware/quintuna/VC/src/cubemx/Src/usbd_conf.c
@@ -20,15 +20,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 
-#if defined(STM32H733xx) 
 #include "stm32h7xx.h"
 #include "stm32h7xx_hal.h"
 
-#elif defined (STM32H562xx)
-#include "stm32h5xx.h"
-#include "stm32h5xx_hal.h"
-#endif
-
 #include "usbd_def.h"
 #include "usbd_core.h"
 #include "usbd_cdc.h"
diff --git a/firmware/shared/srcpp/hw/usb/usb_device.c b/firmware/shared/srcpp/hw/usb/usb_device.c
@@ -0,0 +1,100 @@
+/* USER CODE BEGIN Header */
+/**
+ ******************************************************************************
+ * @file           : usb_device.c
+ * @version        : v1.0_Cube
+ * @brief          : This file implements the USB Device
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2025 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "usb_device.h"
+#include "usbd_core.h"
+#include "usbd_desc.h"
+#include "usbd_cdc.h"
+#include "usbd_cdc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN PV */
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE END PV */
+
+/* USER CODE BEGIN PFP */
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE END PFP */
+
+/* USB Device Core handle declaration. */
+USBD_HandleTypeDef hUsbDeviceHS;
+
+/*
+ * -- Insert your variables declaration here --
+ */
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/*
+ * -- Insert your external function declaration here --
+ */
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/**
+ * Init USB device Library, add supported class and start the library
+ * @retval None
+ */
+void MX_USB_DEVICE_Init(void)
+{
+    /* USER CODE BEGIN USB_DEVICE_Init_PreTreatment */
+
+    /* USER CODE END USB_DEVICE_Init_PreTreatment */
+
+    /* Init Device Library, add supported class and start the library. */
+    if (USBD_Init(&hUsbDeviceHS, &HS_Desc, DEVICE_HS) != USBD_OK)
+    {
+        Error_Handler();
+    }
+    if (USBD_RegisterClass(&hUsbDeviceHS, &USBD_CDC) != USBD_OK)
+    {
+        Error_Handler();
+    }
+    if (USBD_CDC_RegisterInterface(&hUsbDeviceHS, &USBD_Interface_fops_HS) != USBD_OK)
+    {
+        Error_Handler();
+    }
+    if (USBD_Start(&hUsbDeviceHS) != USBD_OK)
+    {
+        Error_Handler();
+    }
+
+    /* USER CODE BEGIN USB_DEVICE_Init_PostTreatment */
+    HAL_PWREx_EnableUSBVoltageDetector();
+
+    /* USER CODE END USB_DEVICE_Init_PostTreatment */
+}
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
diff --git a/firmware/shared/srcpp/hw/usb/usb_device.h b/firmware/shared/srcpp/hw/usb/usb_device.h
@@ -28,10 +28,10 @@ extern "C"
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#ifdef STM32H733xx
+#ifdef (STM32H733xx)
 #include "stm32h7xx.h"
 #include "stm32h7xx_hal.h"
-#elif STM32H562xx
+#elif (STM32H562xx)
 #include "stm32h5xx.h"
 #include "stm32h5xx_hal.h"
 #else
diff --git a/firmware/shared/srcpp/hw/usb/usbd_cdc_if.c b/firmware/shared/srcpp/hw/usb/usbd_cdc_if.c
diff --git a/firmware/shared/srcpp/hw/usb/usbd_conf.c b/firmware/shared/srcpp/hw/usb/usbd_conf.c
diff --git a/firmware/shared/srcpp/hw/usb/usbd_conf.h b/firmware/shared/srcpp/hw/usb/usbd_conf.h
diff --git a/firmware/shared/srcpp/hw/usb/usbd_csc_if.c b/firmware/shared/srcpp/hw/usb/usbd_csc_if.c
diff --git a/firmware/shared/srcpp/hw/usb/usbd_desc.c b/firmware/shared/srcpp/hw/usb/usbd_desc.c

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+#define USBD_PRODUCT_STRING_HS "bms"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+#define USBD_PRODUCT_STRING_HS "crit"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+#define USBD_PRODUCT_STRING_HS "fsm"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-24f2726de63b4722b40c701d9e657dbe`
	`1`	`+532332e080dc479810983725e8acb38b`