From e6ab9ea3c6039789f70ce62fbc3ad0d4e471947e Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Fri, 14 Feb 2025 14:58:10 -0800
Subject: [PATCH] [TractylM] Remove USB HS code in favor of it being at
 keyboard level

---
 .../5x6_right/keymaps/drashna/config.h           |  4 ----
 .../5x6_right/keymaps/drashna/keymap.c           | 16 ++--------------
 .../5x6_right/keymaps/drashna/mcuconf.h          |  7 -------
 .../5x6_right/keymaps/drashna/rules.mk           |  1 +
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index 2860a10b4b..316e58b10c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -60,10 +60,6 @@
 #define SPLIT_WATCHDOG_TIMEOUT          700
 #define AUDIO_INIT_DELAY
 
-#ifdef USE_USB_OTG_HS_PORT
-#    define USB_DRIVER USBD2
-#endif
-
 #if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f407)
 #    define ST7789_CS_PIN A8
 #endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 5dc7488c4e..2619d0020c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -6,8 +6,8 @@
 // USB Port Pin Definitions
 // black - GND
 // red - VCC
-// white - D- - A11
-// blue - D+ - A12
+// white - D- - A11 - B14
+// blue - D+ - A12 - B15
 // green - CC1
 // yellow - CC2
 
@@ -103,18 +103,6 @@ void keyboard_post_init_keymap(void) {
 }
 #endif // QUANTUM_PAINTER_ENABLE &&  !CUSTOM_QUANTUM_PAINTER_ENABLE
 
-#ifdef USE_USB_OTG_HS_PORT
-#    pragma message("Using USB OTG HS Port")
-void early_hardware_init_post(void) {
-    // D-  white
-    palSetLineMode(
-        B14, PAL_MODE_ALTERNATE(12) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING);
-    // D+  blue
-    palSetLineMode(
-        B15, PAL_MODE_ALTERNATE(12) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING);
-}
-#endif
-
 void execute_user_button_action(bool state) {
     // for the double tap action of the reset pin
     static bool     last_state     = false;
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/mcuconf.h
index 3fb34dfe87..362905ed4e 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/mcuconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/mcuconf.h
@@ -14,10 +14,3 @@
 #    undef STM32_I2C_BUSY_TIMEOUT
 #    define STM32_I2C_BUSY_TIMEOUT 10
 #endif
-
-#ifdef USE_USB_OTG_HS_PORT
-#    undef STM32_USB_USE_OTG1
-#    define STM32_USB_USE_OTG1 FALSE
-#    undef STM32_USB_USE_OTG2
-#    define STM32_USB_USE_OTG2 TRUE
-#endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index c26e65f7f1..ff87f7b1f9 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -34,6 +34,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f405)
     CUSTOM_QUANTUM_PAINTER_ST7789_170X320 = no
     CUSTOM_QUANTUM_PAINTER_ST7789_135X240 = no
     WEAR_LEVELING_DRIVER                  = spi_flash
+    USE_USB_OTG_HS_PORT                   = yes
 endif
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f407)
     OVERLOAD_FEATURES                     = yes