Improvement: external pedals support and fixes

Author: r57zone

README.RU.md

@@ -2,7 +2,7 @@
 [![RU](https://user-images.githubusercontent.com/9499881/27683795-5b0fbac6-5cd8-11e7-929c-057833e01fb1.png)](https://github.com/r57zone/DSAdvance/blob/master/README.RU.md)
 
 # DSAdvance
-Продвинутая эмуляция Xbox геймпада для Sony DualSense, DualShock 4, Nintendo Pro контроллера или Joycon-ов. Поддерживается прицеливание и вождение наклонами геймпада, а также эмуляция стиков на тачпаде. Работает на базе драйвера [ViGEm](https://github.com/ViGEm).
+Продвинутая эмуляция Xbox геймпада для Sony DualSense, DualShock 4, Nintendo Pro контроллера или Joycon-ов. Поддерживается прицеливание и вождение наклонами геймпада, эмуляция стиков на тачпаде, а также [внешние педали](https://github.com/r57zone/XboxExternalPedals). Работает на базе драйвера [ViGEm](https://github.com/ViGEm).
 
 [![](https://user-images.githubusercontent.com/9499881/164945071-5b9f86dd-c396-45a5-817b-fc7068450f02.gif)](https://youtu.be/gkyqO_HuPnk)
 [![](https://user-images.githubusercontent.com/9499881/164945073-cfa1bfb7-cb82-4714-b2ad-7ecd84a5bcfc.gif)](https://youtu.be/gkyqO_HuPnk)
@@ -26,6 +26,9 @@
 
 По умолчанию кнопка микрофона делает скринщот `Win+Alt+PrtScr` (для DualShock 4 включаем `PSMultiKey` и нажимаем `PS + X`). Изменив параметр `MicCustomKey` на [нужный код кнопки](https://github.com/r57zone/Half-Life-Alyx-novr/blob/master/BINDINGS.md#codes), будет производится её нажатие.
 
+
+Для подключения внешних педалей измените номер COM-порта, изменив параметр `COMPort`, в разделе `ExternalPedals`.
+
 ## Настройка
 1. Установить [ViGEmBus](https://github.com/ViGEm/ViGEmBus/releases).
 2. Установить Microsoft Visual C++ Redistributable 2017 или новее.

README.md

@@ -3,7 +3,7 @@
 – Other languages / Другие языки
 
 # DSAdvance
-Advanced Xbox gamepad emulation for Sony DualSense, DualShock 4, Nintendo Pro controller or Joy-cons. Supports aiming and driving by tilting the gamepad, as well as emulation of sticks on the touchpad. Works based on the driver [ViGEm](https://github.com/ViGEm).
+Advanced Xbox gamepad emulation for Sony DualSense, DualShock 4, Nintendo Pro controller or Joy-cons. Supports aiming and driving by tilting the gamepad, stick emulation on the touchpad, and [external pedals](https://github.com/r57zone/XboxExternalPedals). Works based on the driver [ViGEm](https://github.com/ViGEm).
 
 [![](https://user-images.githubusercontent.com/9499881/164945071-5b9f86dd-c396-45a5-817b-fc7068450f02.gif)](https://youtu.be/gkyqO_HuPnk)
 [![](https://user-images.githubusercontent.com/9499881/164945073-cfa1bfb7-cb82-4714-b2ad-7ecd84a5bcfc.gif)](https://youtu.be/gkyqO_HuPnk)
@@ -24,6 +24,9 @@ By default, the `PS` button opens the "Xbox Game Bar" (by pressing `Win+G`). By
 
 By default, the microphone button takes a screenshot of `Win+Alt+PrtScr` (for DualShock 4 enable `PSMultiKey` and press `PS + X`). By changing the `MicCustomKey` parameter to the [desired button code](https://github.com/r57zone/Half-Life-Alyx-novr/blob/master/BINDINGS.md#codes), it will be pressed.
 
+
+To connect external pedals, change the COM port number by changing the `COMPort` parameter in the `ExternalPedals` section.
+
 ## Setup
 1. Install [ViGEmBus](https://github.com/ViGEm/ViGEmBus/releases).
 2. Install Microsoft Visual C++ Redistributable 2017 or newer.

Source/DSAdvance/DSAdvance.cpp

@@ -10,10 +10,35 @@
 #include "JoyShockLibrary\JoyShockLibrary.h"
 #include "hidapi.h"
 #include "DSAdvance.h"
+#include <thread>
 
 Gamepad CurGamepad;
 InputOutState GamepadOutState;
 
+bool ExternalPedalsConnected = false;
+HANDLE hSerial;
+std::thread *pArduinoReadThread = NULL;
+float PedalsValues[2];
+
+void ArduinoRead()
+{
+	DWORD bytesRead;
+
+	while (ExternalPedalsConnected) {
+		ReadFile(hSerial, &PedalsValues, sizeof(PedalsValues), &bytesRead, 0);
+
+		if (PedalsValues[0] > 1.0 || PedalsValues[0] < 0 || PedalsValues[1] > 1.0 || PedalsValues[1] < 0)
+		{
+			PedalsValues[0] = 0;
+			PedalsValues[1] = 0;
+
+			PurgeComm(hSerial, PURGE_TXCLEAR | PURGE_RXCLEAR);
+		}
+
+		if (bytesRead == 0) Sleep(1);
+	}
+}
+
 void GamepadSetState(InputOutState OutState)
 {
 	if (CurGamepad.HidHandle != NULL) {
@@ -190,14 +215,14 @@ double RadToDeg(double Rad)
 	return Rad / 3.14159265358979323846 * 180.0;
 }
 
-double OffsetYPR(float f, float f2)
+double OffsetYPR(float Angle1, float Angle2)
 {
-	f -= f2;
-	if (f < -180)
-		f += 360;
-	else if (f > 180)
-		f -= 360;
-	return f;
+	Angle1 -= Angle2;
+	if (Angle1 < -180)
+		Angle1 += 360;
+	else if (Angle1 > 180)
+		Angle1 -= 360;
+	return Angle1;
 }
 
 static std::mutex m;
@@ -217,13 +242,14 @@ VOID CALLBACK notification(
 	m.unlock();
 }
 
-float DeadZoneAxis(float StickAxis, float DeadZoneValue)
+float DeadZoneAxis(float StickAxis, float DeadZoneValue) // Possibly wrong
 {
 	if (StickAxis > 0) {
 		StickAxis -= DeadZoneValue;
 		if (StickAxis < 0)
 			StickAxis = 0;
-	} else if (StickAxis < 0) {
+	}
+	else if (StickAxis < 0) {
 		StickAxis += DeadZoneValue;
 		if (StickAxis > 0)
 			StickAxis = 0;
@@ -271,7 +297,7 @@ SHORT ToLeftStick(double Value, float WheelAngle)
 	return LeftAxisX;
 }
 
-void DefMainText(int ControllerCount, int EmuMode, int AimMode, bool ChangeModesWithoutPress, bool ShowBatteryStatus) {
+void DefMainText(int ControllerCount, int EmuMode, int AimMode, bool ChangeModesWithoutPress, bool ShowBatteryStatus, bool ExternalPedals) {
 	system("cls");
 	if (ControllerCount < 1)
 		printf("\n Connect DualSense, DualShock 4, Pro controller or Joycons and reset.");
@@ -280,7 +306,7 @@ void DefMainText(int ControllerCount, int EmuMode, int AimMode, bool ChangeModes
 	if (ControllerCount > 0 && ShowBatteryStatus && CurGamepad.ControllerType == SONY_DUALSENSE) {
 		printf(" Gamepad mode:");
 		if (CurGamepad.USBConnection) printf(" wired"); else printf(" wireless (not recomended for gyro aiming)");
-		printf(", battery charge: %d\%%", CurGamepad.BatteryLevel);
+		printf(", battery charge: %d\%%.", CurGamepad.BatteryLevel);
 		if (CurGamepad.BatteryMode == 0x2)
 			printf(" (charging)", CurGamepad.BatteryLevel);
 		printf("\n");
@@ -294,6 +320,9 @@ void DefMainText(int ControllerCount, int EmuMode, int AimMode, bool ChangeModes
 		printf(" Emulation: -");
 	printf(", press \"ALT\" + \"Q\" to switch.\n");
 
+	if (ExternalPedals)
+		printf(" External pedals connected.\n");
+
 	if (AimMode == 1) printf(" AIM mode = mouse"); else printf(" AIM mode = mouse-joystick");
 	printf(", press \"ALT\" + \"A\" to switch.\n");
 
@@ -305,7 +334,7 @@ void DefMainText(int ControllerCount, int EmuMode, int AimMode, bool ChangeModes
 
 int main(int argc, char **argv)
 {
-	SetConsoleTitle("DSAdvance 0.6.3");
+	SetConsoleTitle("DSAdvance 0.7");
 	// Config parameters
 	CIniReader IniFile("Config.ini");
 
@@ -333,7 +362,7 @@ int main(int argc, char **argv)
 	bool ChangeModesWithoutPress = IniFile.ReadBoolean("Gamepad", "ChangeModesWithoutPress", false);
 
 	bool AimMode = IniFile.ReadBoolean("Motion", "AimMode", false);
-	float MotionWheelAngle = IniFile.ReadFloat("Motion", "WheelAngle", 75);
+	float MotionWheelAngle = IniFile.ReadFloat("Motion", "WheelAngle", 150) / 2.0f;
 	float MotionSensX = IniFile.ReadFloat("Motion", "MouseSensX", 3) / 10.0f;;
 	float MotionSensY = IniFile.ReadFloat("Motion", "MouseSensY", 3) / 10.0f;;
 	float JoySensX = IniFile.ReadFloat("Motion", "JoySensX", 3);
@@ -342,6 +371,35 @@ int main(int argc, char **argv)
 	bool PSMultiKey = !IniFile.ReadBoolean("Gamepad", "PSMultiKey", false);
 	int MicCustomKey = IniFile.ReadInteger("Gamepad", "MicCustomKey", 0);
 
+	int ExternalPedalsCOMPort = IniFile.ReadInteger("ExternalPedals", "COMPort", 0);
+	if (ExternalPedalsCOMPort != 0) {
+		char sPortName[32];
+		sprintf_s(sPortName, "\\\\.\\COM%d", ExternalPedalsCOMPort);
+
+		hSerial = ::CreateFile(sPortName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+
+		if (hSerial != INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_NOT_FOUND) {
+
+			DCB dcbSerialParams = { 0 };
+			dcbSerialParams.DCBlength = sizeof(dcbSerialParams);
+
+			if (GetCommState(hSerial, &dcbSerialParams))
+			{
+				dcbSerialParams.BaudRate = CBR_115200;
+				dcbSerialParams.ByteSize = 8;
+				dcbSerialParams.StopBits = ONESTOPBIT;
+				dcbSerialParams.Parity = NOPARITY;
+
+				if (SetCommState(hSerial, &dcbSerialParams))
+				{
+					ExternalPedalsConnected = true;
+					PurgeComm(hSerial, PURGE_TXCLEAR | PURGE_RXCLEAR);
+					pArduinoReadThread = new std::thread(ArduinoRead);
+				}
+			}
+		}
+	}
+
 	GamepadSearch();
 	GamepadOutState.PlayersCount = 0;
 	GamepadOutState.LEDBlue = 255;
@@ -361,7 +419,7 @@ int main(int argc, char **argv)
 	int deviceID[4];
 	JslGetConnectedDeviceHandles(deviceID, controllersCount);
 
-	DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false);
+	DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected);
 
 	JOY_SHOCK_STATE InputState;
 	MOTION_STATE MotionState;
@@ -384,7 +442,7 @@ int main(int argc, char **argv)
 		if (((GetAsyncKeyState(VK_MENU) & 0x8000) != 0) && (GetAsyncKeyState(VK_F9) & 0x8000) != 0  && SkipPollCount == 0)
 		{
 			DeadZoneMode = !DeadZoneMode;
-			if (DeadZoneMode == false) DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false);
+			if (DeadZoneMode == false) DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected);
 			SkipPollCount = SkipPollTimeOut;
 		}
 
@@ -400,12 +458,12 @@ int main(int argc, char **argv)
 			controllersCount = JslConnectDevices();
 			JslGetConnectedDeviceHandles(deviceID, controllersCount);
 			//if (CurGamepad.HidHandle != NULL)
-				//hid_close(CurGamepad.HidHandle); // conflict with jsl?
+				//hid_close(CurGamepad.HidHandle); // conflict with Jsl?
 			GamepadSearch();
 			GamepadSetState(GamepadOutState);
 			BTReset = false;
 			SkipPollCount = SkipPollTimeOut;
-			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false);
+			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected);
 		}
 
 		if ((GetAsyncKeyState(VK_MENU) & 0x8000) != 0 && (GetAsyncKeyState('Q') & 0x8000) != 0 && SkipPollCount == 0) // Disable Xbox controller emulation for games that support DualSense, DualShock, Nintendo controllers or enable only driving & mouse aiming
@@ -421,21 +479,21 @@ int main(int argc, char **argv)
 				ret = vigem_target_x360_register_notification(client, x360, &notification, nullptr);
 			}
 
-			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false);
+			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected);
 			SkipPollCount = SkipPollTimeOut;
 		}
 
 		if ((GetAsyncKeyState(VK_MENU) & 0x8000) != 0 && (GetAsyncKeyState('A') & 0x8000) != 0 && SkipPollCount == 0)
 		{
 			AimMode = !AimMode;
-			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false);
+			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected);
 			SkipPollCount = SkipPollTimeOut;
 		}
 
 		if ((GetAsyncKeyState(VK_MENU) & 0x8000) != 0 && (GetAsyncKeyState('W') & 0x8000) != 0 && SkipPollCount == 0)
 		{
 			ChangeModesWithoutPress = !ChangeModesWithoutPress;
-			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false);
+			DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected);
 			SkipPollCount = SkipPollTimeOut;
 		}
 
@@ -480,7 +538,7 @@ int main(int argc, char **argv)
 							GamepadOutState.LEDBlue = 255; GamepadOutState.LEDRed = 0; GamepadOutState.LEDGreen = 0;
 							// Show battery level
 							GetBatteryInfo(); BackOutStateCounter = 40; GamepadOutState.PlayersCount = CurGamepad.LEDBatteryLevel; GamepadSetState(GamepadOutState); // JslSetPlayerNumber(deviceID[0], 5);
-							DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, true);
+							DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, true, ExternalPedalsConnected);
 							if (ResetOnDefaultMode && SkipPollCount == 0) { SkipPollCount = SkipPollTimeOut; BTReset = true; }
 						} else {  // Touch sticks mode
 							GamepadMode = TouchpadSticksMode;
@@ -516,6 +574,15 @@ int main(int argc, char **argv)
 
 		report.bLeftTrigger = InputState.lTrigger * 255;
 		report.bRightTrigger = InputState.rTrigger * 255;
+
+		if (ExternalPedalsConnected) {
+			if (InputState.lTrigger == 0)
+				report.bLeftTrigger = PedalsValues[0] * 255;
+			if (InputState.rTrigger == 0)
+				report.bRightTrigger = PedalsValues[1] * 255;
+		}
+
+
 		if (JslGetControllerType(deviceID[0]) == JS_TYPE_DS || JslGetControllerType(deviceID[0]) == JS_TYPE_DS4) { 
 			report.wButtons |= InputState.buttons & JSMASK_SHARE ? XINPUT_GAMEPAD_BACK : 0;
 			report.wButtons |= InputState.buttons & JSMASK_OPTIONS ? XINPUT_GAMEPAD_START : 0;
@@ -650,7 +717,7 @@ int main(int argc, char **argv)
 		}
 
 		// Battery level display
-		if (BackOutStateCounter > 0) { if (BackOutStateCounter == 1) { GamepadOutState.PlayersCount = 0; GamepadSetState(GamepadOutState); DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false); } BackOutStateCounter--; } 
+		if (BackOutStateCounter > 0) { if (BackOutStateCounter == 1) { GamepadOutState.PlayersCount = 0; GamepadSetState(GamepadOutState); DefMainText(controllersCount, XboxGamepadEmuMode, AimMode, ChangeModesWithoutPress, false, ExternalPedalsConnected); } BackOutStateCounter--; }
 
 		if (SkipPollCount > 0) SkipPollCount--;
 		Sleep(SleepTimeOut);
@@ -660,6 +727,14 @@ int main(int argc, char **argv)
 	if (CurGamepad.HidHandle != NULL)
 		hid_close(CurGamepad.HidHandle);
 
+	if (ExternalPedalsConnected) {
+		ExternalPedalsConnected = false;
+		pArduinoReadThread->join();
+		delete pArduinoReadThread;
+		pArduinoReadThread = nullptr;
+		CloseHandle(hSerial);
+	}
+
 	vigem_target_x360_unregister_notification(x360);
 	vigem_target_remove(client, x360);
 	vigem_target_free(x360);

Source/DSAdvance/DSAdvance.h

@@ -76,6 +76,15 @@ struct TouchpadTouch {
 	float LastAxisX = 0, LastAxisY = 0;
 };
 
+//struct _AppStatus {
+//	int ControllerCount;
+//	int EmuMode = true;
+//	int AimMode = false;
+//	bool ChangeModesWithoutPress = false;
+//	bool ShowBatteryStatus = false;
+//	bool ExternalPedals = false;
+//};
+
 // https://github.com/JibbSmart/JoyShockLibrary/blob/master/JoyShockLibrary/JoyShock.cpp
 uint32_t crc_table[256] = {
 		0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,