From a1a108445ef9550145d2f486303d8624c06d182c Mon Sep 17 00:00:00 2001 From: James Smith Date: Sun, 1 Jan 2023 11:57:07 -0700 Subject: [PATCH] 34: Changed some digital button names; it seems like that is all that is necessary --- inc/hal/Usb/DreamcastControllerObserver.hpp | 10 +++++----- .../Usb/Hid/UsbGamepadDreamcastControllerObserver.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inc/hal/Usb/DreamcastControllerObserver.hpp b/inc/hal/Usb/DreamcastControllerObserver.hpp index 7344611..d8173fa 100644 --- a/inc/hal/Usb/DreamcastControllerObserver.hpp +++ b/inc/hal/Usb/DreamcastControllerObserver.hpp @@ -20,11 +20,11 @@ class DreamcastControllerObserver unsigned z:1; unsigned y:1; unsigned x:1; - unsigned unknown5:1; - unsigned unknown4:1; - unsigned unknown3:1; - unsigned unknown2:1; - unsigned unknown1:1; + unsigned d:1; + unsigned upb:1; + unsigned downb:1; + unsigned leftb:1; + unsigned rightb:1; unsigned c:1; unsigned b:1; diff --git a/src/hal/Usb/Hid/UsbGamepadDreamcastControllerObserver.cpp b/src/hal/Usb/Hid/UsbGamepadDreamcastControllerObserver.cpp index 0063cdc..54296ba 100644 --- a/src/hal/Usb/Hid/UsbGamepadDreamcastControllerObserver.cpp +++ b/src/hal/Usb/Hid/UsbGamepadDreamcastControllerObserver.cpp @@ -15,11 +15,11 @@ void UsbGamepadDreamcastControllerObserver::setControllerCondition(const Control mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_START, 0 == controllerCondition.start); // Mapping these to random unique buttons just in case something out there uses them - mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TL, 0 == controllerCondition.unknown1); - mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TR, 0 == controllerCondition.unknown2); - mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TL2, 0 == controllerCondition.unknown3); - mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TR2, 0 == controllerCondition.unknown4); - mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_SELECT, 0 == controllerCondition.unknown5); + mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TL, 0 == controllerCondition.rightb); + mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TR, 0 == controllerCondition.leftb); + mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TL2, 0 == controllerCondition.downb); + mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_TR2, 0 == controllerCondition.upb); + mUsbController.setButton(UsbGamepad::GAMEPAD_BUTTON_SELECT, 0 == controllerCondition.d); mUsbController.setDigitalPad(UsbGamepad::DPAD_UP, 0 == controllerCondition.up); mUsbController.setDigitalPad(UsbGamepad::DPAD_DOWN, 0 == controllerCondition.down);