Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2022-10-02 13:36:04 +00:00
commit 08708002aa
2 changed files with 3 additions and 1 deletions

View File

@ -749,6 +749,7 @@ void init_usb_driver(USBDriver *usbp) {
* after a reset. * after a reset.
*/ */
usbDisconnectBus(usbp); usbDisconnectBus(usbp);
usbStop(usbp);
wait_ms(50); wait_ms(50);
usbStart(usbp, &usbcfg); usbStart(usbp, &usbcfg);
usbConnectBus(usbp); usbConnectBus(usbp);
@ -757,8 +758,8 @@ void init_usb_driver(USBDriver *usbp) {
} }
__attribute__((weak)) void restart_usb_driver(USBDriver *usbp) { __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
usbStop(usbp);
usbDisconnectBus(usbp); usbDisconnectBus(usbp);
usbStop(usbp);
#if USB_SUSPEND_WAKEUP_DELAY > 0 #if USB_SUSPEND_WAKEUP_DELAY > 0
// Some hubs, kvm switches, and monitors do // Some hubs, kvm switches, and monitors do

View File

@ -17,6 +17,7 @@
#include "usb_util.h" #include "usb_util.h"
void usb_disconnect(void) { void usb_disconnect(void) {
usbDisconnectBus(&USBD1);
usbStop(&USBD1); usbStop(&USBD1);
} }