WIP rebuild descriptors on USB reset

keyboardio · Feb 5, 2023 · 0f3c54e · 0f3c54e
1 parent b1e1c58
commit 0f3c54e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
@@ -613,6 +613,7 @@ void handleReset(usb_dev *usbd)
     USBCore().nreset++;
     USBCore().setupClass(0);
     EPBuffers().init();
+    USBCore().buildDeviceConfigDescriptor();
     if (resetHook) {
         resetHook();
     }
@@ -769,7 +770,6 @@ void USBCore_::logStatus(const char *status)
 
 void USBCore_::connect()
 {
-    USBCore().buildDeviceConfigDescriptor();
     usb_connect();
 }
 

diff --git a/cores/arduino/USBCore.h b/cores/arduino/USBCore.h
@@ -196,6 +196,8 @@ class USBCore_
         static void transcOutHelper(usb_dev* usbd, uint8_t ep);
         static void transcInHelper(usb_dev* usbd, uint8_t ep);
 
+        void buildDeviceConfigDescriptor();
+
         /*
          * Shadow the global ‘usbd’, which shouldn't be used directly,
          * so that all access is mediated by this class, ensuring all
@@ -230,8 +232,6 @@ class USBCore_
         void transcOut(usb_dev* usbd, uint8_t ep);
         void transcIn(usb_dev* usbd, uint8_t ep);
 
-        void buildDeviceConfigDescriptor();
-
         void sendZLP(usb_dev* usbd, uint8_t ep);
 };