Skip to content

A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol

fix usb gamepad

Geof427b08faabf
diff --git a/platformio.ini b/platformio.ini
index 509aa8d4..0328f313 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -21,6 +21,7 @@ lib_deps =
esp32ping
build_flags =
-D CONFIG_TINYUSB_CDC_ENABLED=1
+ -D CONFIG_TINYUSB_HID_ENABLED=1
-D ARDUINO_USB_MODE=1
-D ARDUINO_USB_CDC_ON_BOOT=1
-DDEVICE_CARDPUTER
diff --git a/src/Controllers/UsbCardputerController.cpp b/src/Controllers/UsbCardputerController.cpp
index 0f659c71..2f932529 100644
--- a/src/Controllers/UsbCardputerController.cpp
+++ b/src/Controllers/UsbCardputerController.cpp
@@ -103,13 +103,23 @@ void UsbCardputerController::handleMouse(const TerminalCommand& cmd) {
/*
Gamepad
*/
-void UsbCardputerController::handleGamepad(const TerminalCommand& cmd) {
+void UsbCardputerController::handleGamepad(const TerminalCommand& cmd) {
terminalView.println("USB Gamepad: Configuring HID...");
usbService.gamepadBegin();
- terminalView.println("USB Gamepad: Initialize HID...");
- usbService.gamepadPress(cmd.getSubcommand());
- terminalView.println("USB Gamepad: Key sent.");
-}
+
+ std::string subcmd = cmd.getSubcommand();
+ std::transform(subcmd.begin(), subcmd.end(), subcmd.begin(), ::tolower);
+
+ if (subcmd == "up" || subcmd == "down" || subcmd == "left" || subcmd == "right" ||
+ subcmd == "a" || subcmd == "b") {
+
+ usbService.gamepadPress(subcmd);
+ terminalView.println("USB Gamepad: Key sent.");
+
+ } else {
+ terminalView.println("USB Gamepad: Unknown input. Try up, down, left, right, a, b");
+ }
+}
/*
Stick
@@ -140,7 +150,7 @@ void UsbCardputerController::handleConfig() {
uint8_t mosi = userInputManager.readValidatedPinNumber("SD Card MOSI pin", state.getSpiMOSIPin(), forbidden);
state.setSpiMOSIPin(mosi);
-
+
terminalView.println("USB Configured.");
terminalView.println("\n[WARNING] If you're using USB Serial terminal mode,");
terminalView.println(" using USB commands may interrupt the session.");
@@ -153,7 +163,7 @@ Reset
*/
void UsbCardputerController::handleReset() {
usbService.reset();
- terminalView.println("USB Reset: Resetting...");
+ terminalView.println("USB Reset: Disable interfaces...");
}
/*
diff --git a/src/Services/UsbCardputerService.cpp b/src/Services/UsbCardputerService.cpp
index 8b236c96..136a1330 100644
--- a/src/Services/UsbCardputerService.cpp
+++ b/src/Services/UsbCardputerService.cpp
@@ -111,8 +111,8 @@ void UsbCardputerService::mouseRelease(int button) {
void UsbCardputerService::gamepadBegin() {
if (gamepadActive) return;
- USB.begin();
gamepad.begin();
+ USB.begin();
gamepadActive = true;
hidInitTime = millis();
}
@@ -125,34 +125,37 @@ void UsbCardputerService::gamepadPress(const std::string& name) {
delay(10);
}
- // Valeurs par défaut (repos)
- int8_t x = 0, y = 0, z = 0, rz = 0, rx = 0, ry = 0;
- uint8_t hat = HAT_CENTER;
- uint32_t buttons = 0;
+ // Reset before any new input
+ gamepad.hat(HAT_CENTER);
+ for (int i = 0; i < 32; ++i) {
+ gamepad.releaseButton(i);
+ }
- // Interprétation de la commande
if (name == "up") {
- hat = HAT_UP;
+ gamepad.hat(HAT_UP);
} else if (name == "down") {
- hat = HAT_DOWN;
+ gamepad.hat(HAT_DOWN);
} else if (name == "left") {
- hat = HAT_LEFT;
+ gamepad.hat(HAT_LEFT);
} else if (name == "right") {
- hat = HAT_RIGHT;
+ gamepad.hat(HAT_RIGHT);
} else if (name == "a") {
- buttons = (1 << BUTTON_A);
+ gamepad.pressButton(BUTTON_A);
} else if (name == "b") {
- buttons = (1 << BUTTON_B);
+ gamepad.pressButton(BUTTON_B);
} else {
- return; // commande inconnue
+ return; // unknow
}
- // Envoie de l'état
- gamepad.send(x, y, z, rz, rx, ry, hat, buttons);
- delay(100); // Simule une pression courte
- gamepad.send(0, 0, 0, 0, 0, 0, HAT_CENTER, 0); // Relâche tout
+ delay(500); // simulate short press
+
+ // Reset state
+ gamepad.hat(HAT_CENTER);
+ gamepad.releaseButton(BUTTON_A);
+ gamepad.releaseButton(BUTTON_B);
}
+
bool UsbCardputerService::isKeyboardActive() const {
return keyboardActive;
}
@@ -230,12 +233,14 @@ void UsbCardputerService::reset() {
if (initialized) {
keyboard.releaseAll(); // si clavier actif
msc.end(); // si stockage actif
- // USB.~ESPUSB(); // force la destruction de l'instance USB
- // USB.enableDFU(); // réinitialise le contrôleur USB (important)
+ keyboard.end();
+ gamepad.end();
+ mouse.end();
initialized = false;
keyboardActive = false;
storageActive = false;
mouseActive = false;
+ gamepadActive = false;
}
}