Move EnableUSBVoltageDetector from clock setup to USB conf

Igor-Misic · Igor-Misic · commit 2fc37fe144a4 · 2025-02-20T21:22:17.000+01:00
diff --git a/Bootloader/Adapters/Src/system_clock_adapter.c b/Bootloader/Adapters/Src/system_clock_adapter.c
@@ -136,9 +136,6 @@ SystemClock_Config(void) {
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
         Error_Handler();
     }
-    /** Enable USB Voltage detector
-    */
-    HAL_PWREx_EnableUSBVoltageDetector();
 }
 #elif defined(STM32F7xx)
 void
diff --git a/Bootloader/STM32/UsbDevice/FS/usb_device.c b/Bootloader/STM32/UsbDevice/FS/usb_device.c
@@ -82,6 +82,10 @@ MX_USB_DEVICE_Init(void) {
     if (USBD_Start(&hUsbDeviceFS) != USBD_OK) {
         Error_Handler();
     }
+
+#ifdef STM32H7xx
+    HAL_PWREx_EnableUSBVoltageDetector();
+#endif
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,6 @@ SystemClock_Config(void) {`
`136`	`136`	`if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {`
`137`	`137`	`Error_Handler();`
`138`	`138`	`}`
`139`		`- /** Enable USB Voltage detector`
`140`		`- */`
`141`		`- HAL_PWREx_EnableUSBVoltageDetector();`
`142`	`139`	`}`
`143`	`140`	`#elif defined(STM32F7xx)`
`144`	`141`	`void`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ MX_USB_DEVICE_Init(void) {`
`82`	`82`	`if (USBD_Start(&hUsbDeviceFS) != USBD_OK) {`
`83`	`83`	`Error_Handler();`
`84`	`84`	`}`
	`85`	`+`
	`86`	`+#ifdef STM32H7xx`
	`87`	`+ HAL_PWREx_EnableUSBVoltageDetector();`
	`88`	`+#endif`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`/**`