cleanup examples

tobozo · Sep 14, 2023 · 434e30e · 434e30e
1 parent 7d591ea
commit 434e30e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 401 deletions.
diff --git a/examples/ESP32-S3-USB_Test/ESP32-S3-USB_Test.ino b/examples/ESP32-S3-USB_Test/ESP32-S3-USB_Test.ino
@@ -11,7 +11,6 @@
 #define DM_P0  16  // USB Host Data- Pin (must be an analog pin)
 #define FORCE_TEMPLATED_NOPS
 #include <ESP32-USB-Soft-Host.h>
-#include "usbkbd.h"
 
 // Device Part (handles HID device emulation)
 #include "USB.h"
@@ -80,6 +79,11 @@ void setup()
   // USH.setTaskCore( 0 );
   // USH.setBlinkPin( (gpio_num_t) 2 );
   // USH.setTaskPriority( 16 );
+  USH.setOnConfigDescCB( Default_USB_ConfigDescCB );
+  USH.setOnIfaceDescCb( Default_USB_IfaceDescCb );
+  USH.setOnHIDDevDescCb( Default_USB_HIDDevDescCb );
+  USH.setOnEPDescCb( Default_USB_EPDescCb );
+
   USH.init( USB_Pins_Config, onKeyboarDetect, onKeyboardData );
 }
 

diff --git a/examples/ESP32-S3-USB_Test/usbkbd.h b/examples/ESP32-S3-USB_Test/usbkbd.h
diff --git a/examples/USB_Test/USB_Test.ino b/examples/USB_Test/USB_Test.ino
@@ -1,9 +1,8 @@
 #define DEBUG_ALL
 #define FORCE_TEMPLATED_NOPS
 #include <ESP32-USB-Soft-Host.h>
-#include "usbkbd.h" // KeyboardReportParser
 
-#if defined ARDUINO_LOLIN_S3
+#if defined ARDUINO_LOLIN_S3 || defined ARDUINO_LOLIN_S3_PRO
 
   #define PROFILE_NAME "LoLin S3"
   #define DP_P0  15  // always enabled
@@ -149,6 +148,11 @@ void setup()
   // USH.setTaskCore( 0 );
   // USH.setBlinkPin( (gpio_num_t) 2 );
   // USH.setTaskPriority( 16 );
+  USH.setOnConfigDescCB( Default_USB_ConfigDescCB );
+  USH.setOnIfaceDescCb( Default_USB_IfaceDescCb );
+  USH.setOnHIDDevDescCb( Default_USB_HIDDevDescCb );
+  USH.setOnEPDescCb( Default_USB_EPDescCb );
+
   USH.init( USB_Pins_Config, my_USB_DetectCB, my_USB_PrintCB );
 }