BT support for compatible DualShock 4 gamepads and renaming of buttons for binding

Author: r57zone

BINDINGS.RU.md

@@ -14,9 +14,9 @@
 ## Клавиатура и мышь
 Название клавиши | Значение
 ------------ | -------------
-MOUSE LEFT CLICK | `MOUSE-LEFT-CLICK`
-MOUSE RIGHT CLICK | `MOUSE-RIGHT-CLICK`
-MOUSE MIDDLE CLICK | `MOUSE-MIDDLE-CLICK`
+MOUSE LEFT CLICK | `MOUSE-LEFT`
+MOUSE RIGHT CLICK | `MOUSE-RIGHT`
+MOUSE MIDDLE CLICK | `MOUSE-MIDDLE`
 MOUSE WHEEL UP | `MOUSE-WHEEL-UP`
 MOUSE WHEEL DOWN | `MOUSE-WHEEL-DOWN`
 ESCAPE | `ESCAPE`

BINDINGS.md

@@ -13,9 +13,9 @@ Mouse wheel scrolling | MOUSE-WHEEL
 ## Keyboard and mouse
 Key name | Value
 ------------ | -------------
-MOUSE LEFT CLICK | `MOUSE-LEFT-CLICK`
-MOUSE RIGHT CLICK | `MOUSE-RIGHT-CLICK`
-MOUSE MIDDLE CLICK | `MOUSE-MIDDLE-CLICK`
+MOUSE LEFT CLICK | `MOUSE-LEFT`
+MOUSE RIGHT CLICK | `MOUSE-RIGHT`
+MOUSE MIDDLE CLICK | `MOUSE-MIDDLE`
 MOUSE WHEEL UP | `MOUSE-WHEEL-UP`
 MOUSE WHEEL DOWN | `MOUSE-WHEEL-DOWN`
 ESCAPE | `ESCAPE`

Profiles/Clive Barkers - Undying.ini

@@ -1,6 +1,6 @@
 [GAMEPAD]
-LEFT-TRIGGER = MOUSE-RIGHT-CLICK
-RIGHT-TRIGGER = MOUSE-LEFT-CLICK
+LEFT-TRIGGER = MOUSE-RIGHT
+RIGHT-TRIGGER = MOUSE-LEFT
 
 L1-LB = E
 R1-RB = END

Profiles/Desktop.ini

@@ -2,8 +2,8 @@
 LEFT-TRIGGER = HIDE-APPS
 RIGHT-TRIGGER = FULLSCREEN-PLUS
 
-L1-LB = MOUSE-RIGHT-CLICK
-R1-RB = MOUSE-LEFT-CLICK
+L1-LB = MOUSE-RIGHT
+R1-RB = MOUSE-LEFT
 
 BACK = ESCAPE
 START = WIN
@@ -26,7 +26,7 @@ LEFT-STICK = MOUSE-LOOK
 LEFT-STICK-CLICK = CHANGE-LANGUAGE
 
 RIGHT-STICK = MOUSE-WHEEL
-RIGHT-STICK-CLICK = MOUSE-MIDDLE-CLICK
+RIGHT-STICK-CLICK = MOUSE-MIDDLE
 
 [MOUSE]
 SensitivityX = 75

Profiles/FPS.ini

@@ -1,6 +1,6 @@
 [GAMEPAD]
-LEFT-TRIGGER = MOUSE-RIGHT-CLICK
-RIGHT-TRIGGER = MOUSE-LEFT-CLICK
+LEFT-TRIGGER = MOUSE-RIGHT
+RIGHT-TRIGGER = MOUSE-LEFT
 
 L1-LB = F
 R1-RB = G

Source/DSAdvance/DSAdvance.cpp

@@ -202,17 +202,60 @@ void GamepadSetState(InputOutState OutState)
 		} else if (CurGamepad.ControllerType == NINTENDO_SWITCH_PRO) { // Need test
 				unsigned char outputReport[64] = { 0 };
 
-				outputReport[0] = 0x10;
+				/*outputReport[0] = 0x10;
 				outputReport[1] = (++CurGamepad.PacketCounter) & 0xF; if (CurGamepad.PacketCounter > 0xF) CurGamepad.PacketCounter = 0x0;
 				outputReport[2] = std::clamp(OutState.SmallMotor - 0, 0, 229); // It seems that it is not recommended to use the Nintendo Switch motors at 100 % , there is a risk of damaging them, so we will limit ourselves to 90%
 				outputReport[6] = std::clamp(OutState.LargeMotor - 0, 0, 229);
 
-				// USB
+				// BT
+				if (!CurGamepad.USBConnection) {
+					outputReport[0] = 0x80; // Заголовок для Bluetooth
+					outputReport[1] = 0x92; // Команда вибрации для Bluetooth
+					outputReport[3] = 0x31; // Подкоманда для вибрации
+					outputReport[8] = 0x10; // Дополнительные данные для Bluetooth
+				}*/
+
+				// Настройка амплитуды
+				/*unsigned char h_amp = (OutState.SmallMotor / 649) * 2;
+				unsigned char l_amp1 = (OutState.LargeMotor / 649);
+				unsigned char l_amp2 = ((l_amp1 % 2) * 128);
+				l_amp1 = (l_amp1 / 2) + 64;
+
+				outputReport[2] = 0x20; // Высокая частота
+				outputReport[4] = 0x28; // Низкая частота
+				outputReport[3] = h_amp;
+				outputReport[5] = l_amp1;
+				outputReport[4] += l_amp2;
+
+				// USB-пакет
 				if (CurGamepad.USBConnection) {
 					outputReport[0] = 0x80;
 					outputReport[1] = 0x92;
 					outputReport[3] = 0x31;
 					outputReport[8] = 0x10;
+				}*/
+
+				outputReport[0] = 0x10;
+				outputReport[1] = (++CurGamepad.PacketCounter) & 0xF;
+				if (CurGamepad.PacketCounter > 0xF) CurGamepad.PacketCounter = 0x0;
+
+				unsigned char hf = 0x20; // Высокая частота
+				unsigned char lf = 0x28; // Низкая частота
+				unsigned char h_amp = std::clamp(OutState.SmallMotor * 2 / 229, 0, 255);
+				unsigned char l_amp1 = std::clamp(OutState.LargeMotor / 229, 0, 255);
+				unsigned char l_amp2 = ((l_amp1 % 2) * 128);
+				l_amp1 = (l_amp1 / 2) + 64;
+
+				outputReport[2] = hf;
+				outputReport[3] = h_amp;
+				outputReport[4] = lf + l_amp2;
+				outputReport[5] = l_amp1;
+
+				if (!CurGamepad.USBConnection) {
+					outputReport[0] = 0x80;
+					outputReport[1] = 0x92;
+					outputReport[3] = 0x31;
+					outputReport[8] = 0x10;
 				}
 
 				hid_write(CurGamepad.HidHandle, outputReport, 64);
@@ -256,12 +299,19 @@ void GamepadSearch() {
 				CurGamepad.ControllerType = SONY_DUALSHOCK4;
 				CurGamepad.USBConnection = true;
 
-				// BT detection
+				// JoyShock Library apparently sent something, so it worked without a package (needed for BT detection to work, does not affect USB)
+				unsigned char checkBT[2] = { 0x02, 0x00 };
+				hid_write(CurGamepad.HidHandle, checkBT, sizeof(checkBT));
+
+				// BT detection for compatible gamepads that output USB VID/PID on BT connection
 				unsigned char buf[64];
 				memset(buf, 0, sizeof(buf));
 				int bytesRead = hid_read_timeout(CurGamepad.HidHandle, buf, sizeof(buf), 100);
 				if (bytesRead > 0 && buf[0] == 0x11)
 					CurGamepad.USBConnection = false;
+				
+				//printf("Detected device ID: 0x%X\n", cur_dev->product_id);
+				//if (CurGamepad.USBConnection) printf("USB"); else printf("Wireless");
 
 			} else if (cur_dev->product_id == SONY_DS4_BT) { // ?
 				CurGamepad.ControllerType = SONY_DUALSHOCK4;
@@ -675,7 +725,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 int main(int argc, char **argv)
 {
-	SetConsoleTitle("DSAdvance 1.0.2");
+	SetConsoleTitle("DSAdvance 1.0.3");
 
 	WNDCLASS AppWndClass = {};
 	AppWndClass.lpfnWndProc = WindowProc;
@@ -687,7 +737,6 @@ int main(int argc, char **argv)
 
 	// Config parameters
 	CIniReader IniFile("Config.ini");
-	CurGamepad.TestRumbleProController = IniFile.ReadBoolean("Gamepad", "ProContollerRumble", false); //Temporary test
 	CurGamepad.Sticks.InvertLeftX = IniFile.ReadBoolean("Gamepad", "InvertLeftStickX", false);
 	CurGamepad.Sticks.InvertLeftY = IniFile.ReadBoolean("Gamepad", "InvertLeftStickY", false);
 	CurGamepad.Sticks.InvertRightX = IniFile.ReadBoolean("Gamepad", "InvertRightStickX", false);

Source/DSAdvance/DSAdvance.h

@@ -82,9 +82,9 @@
 #define VK_VOLUME_UP2					175
 #define VK_VOLUME_MUTE2					173
 
-#define VK_MOUSE_LEFT_CLICK				501
-#define VK_MOUSE_MIDDLE_CLICK			502
-#define VK_MOUSE_RIGHT_CLICK			503
+#define VK_MOUSE_LEFT					501
+#define VK_MOUSE_MIDDLE					502
+#define VK_MOUSE_RIGHT					503
 #define VK_MOUSE_WHEEL_UP				504
 #define VK_MOUSE_WHEEL_DOWN				505
 
@@ -128,7 +128,6 @@ struct Gamepad {
 	unsigned char DefaultLEDBrightness = 0;
 	unsigned char PacketCounter = 0;
 	unsigned char RumbleOffCounter = 0;
-	bool TestRumbleProController;
 
 	struct _Sticks
 	{
@@ -306,11 +305,11 @@ void MousePress(int MouseBtn, bool ButtonPressed, Button* ButtonState) {
 	if (ButtonPressed) {
 		ButtonState->UnpressedOnce = true;
 		if (ButtonState->PressedOnce == false) {
-			if (MouseBtn == VK_MOUSE_LEFT_CLICK)
+			if (MouseBtn == VK_MOUSE_LEFT)
 				mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0);
-			else if (MouseBtn == VK_MOUSE_RIGHT_CLICK)
+			else if (MouseBtn == VK_MOUSE_RIGHT)
 				mouse_event(MOUSEEVENTF_RIGHTDOWN, 0, 0, 0, 0);
-			else if (MouseBtn == VK_MOUSE_MIDDLE_CLICK)
+			else if (MouseBtn == VK_MOUSE_MIDDLE)
 				mouse_event(MOUSEEVENTF_MIDDLEDOWN, 0, 0, 0, 0);
 			else if (MouseBtn == VK_MOUSE_WHEEL_UP)
 				mouse_event(MOUSEEVENTF_WHEEL, 0, 0, -120, 0);
@@ -322,11 +321,11 @@ void MousePress(int MouseBtn, bool ButtonPressed, Button* ButtonState) {
 	}
 	else if (ButtonPressed == false && ButtonState->UnpressedOnce) {
 		//printf("unpressed\n");
-		if (MouseBtn == VK_MOUSE_LEFT_CLICK)
+		if (MouseBtn == VK_MOUSE_LEFT)
 			mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
-		else if (MouseBtn == VK_MOUSE_RIGHT_CLICK)
+		else if (MouseBtn == VK_MOUSE_RIGHT)
 			mouse_event(MOUSEEVENTF_RIGHTUP, 0, 0, 0, 0);
-		else if (MouseBtn == VK_MOUSE_MIDDLE_CLICK)
+		else if (MouseBtn == VK_MOUSE_MIDDLE)
 			mouse_event(MOUSEEVENTF_MIDDLEUP, 0, 0, 0, 0);
 		ButtonState->UnpressedOnce = false;
 		ButtonState->PressedOnce = false;
@@ -335,7 +334,7 @@ void MousePress(int MouseBtn, bool ButtonPressed, Button* ButtonState) {
 
 void KeyPress(int KeyCode, bool ButtonPressed, Button* ButtonState) {
 	if (KeyCode == 0) exit;
-	else if (KeyCode == VK_MOUSE_LEFT_CLICK || KeyCode == VK_MOUSE_MIDDLE_CLICK || KeyCode == VK_MOUSE_RIGHT_CLICK || 
+	else if (KeyCode == VK_MOUSE_LEFT || KeyCode == VK_MOUSE_MIDDLE || KeyCode == VK_MOUSE_RIGHT || 
 		KeyCode == VK_MOUSE_WHEEL_UP || KeyCode == VK_MOUSE_WHEEL_DOWN) // Move to mouse press
 		MousePress(KeyCode, ButtonPressed, ButtonState);
 	else if (ButtonPressed) {
@@ -453,9 +452,9 @@ int KeyNameToKeyCode(std::string KeyName) {
 
 	std::unordered_map<std::string, int> KeyMap = {
 		{"NONE", 0},
-		{"MOUSE-LEFT-CLICK", VK_MOUSE_LEFT_CLICK},
-		{"MOUSE-RIGHT-CLICK", VK_MOUSE_RIGHT_CLICK},
-		{"MOUSE-MIDDLE-CLICK", VK_MOUSE_MIDDLE_CLICK},
+		{"MOUSE-LEFT", VK_MOUSE_LEFT},
+		{"MOUSE-RIGHT", VK_MOUSE_RIGHT},
+		{"MOUSE-MIDDLE", VK_MOUSE_MIDDLE},
 		//{"MOUSE-SIDE1-CLICK", VK_XBUTTON1},
 		//{"MOUSE-SIDE2-CLICK", VK_XBUTTON2},
 		{"MOUSE-WHEEL-UP", VK_MOUSE_WHEEL_UP},