This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/make-win32-release.sh b/make-win32-release.sh | |
index 46082af1..fc1d3be5 100644 | |
--- a/make-win32-release.sh | |
+++ b/make-win32-release.sh | |
@@ -9,9 +9,9 @@ GTK_LIBS=(libgtk-3-0.dll libgdk-3-0.dll libharfbuzz-0.dll libfreetype-6.dll | |
libglib-2.0-0.dll libgmodule-2.0-0.dll libgobject-2.0-0.dll | |
libpango-1.0-0.dll libpangocairo-1.0-0.dll libpangoft2-1.0-0.dll | |
libpangowin32-1.0-0.dll libpixman-1-0.dll zlib1.dll libexpat-1.dll | |
- libffi-6.dll libfribidi-0.dll libpcre-1.dll libthai-0.dll liblzma-5.dll | |
- librsvg-2-2.dll libcroco-0.6-3.dll libxml2-2.dll libdatrie-1.dll |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?xml version="1.0" encoding="utf-8"?> | |
<!-- DS4Windows Configuration Data. 01/30/2020 10:22:47 --> | |
<!-- Made with DS4Windows version 2.0.8 --> | |
<DS4Windows> | |
<flushHIDQueue>False</flushHIDQueue> | |
<touchToggle>True</touchToggle> | |
<idleDisconnectTimeout>0</idleDisconnectTimeout> | |
<Color>40,158,23</Color> | |
<RumbleBoost>100</RumbleBoost> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?xml version="1.0" encoding="UTF-8"?> | |
<gamecontroller configversion="6" appversion="2.0"> | |
<!--The SDL name for a joystick is included for informational purposes only.--> | |
<sdlname>X360 Controller</sdlname> | |
<names/> | |
<sets> | |
<set index="1"> | |
<stick index="1"> | |
<deadZone>8000</deadZone> | |
<maxZone>32000</maxZone> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/ViGEmClient.cpp b/src/ViGEmClient.cpp | |
index e1bf4d6..a67b33f 100644 | |
--- a/src/ViGEmClient.cpp | |
+++ b/src/ViGEmClient.cpp | |
@@ -73,6 +73,82 @@ typedef BOOL(WINAPI *MINIDUMPWRITEDUMP)( | |
LONG WINAPI vigem_internal_exception_handler(struct _EXCEPTION_POINTERS* apExceptionInfo); | |
#endif | |
+// | |
+// DeviceIOControl request notification handler classes for X360 and DS4 controller types. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs | |
index f5ccddc..c4111ef 100644 | |
--- a/DS4Windows/DS4Control/ScpUtil.cs | |
+++ b/DS4Windows/DS4Control/ScpUtil.cs | |
@@ -334,6 +334,34 @@ namespace DS4Windows | |
return result; | |
} | |
+ internal static string GetDeviceProperty(string deviceInstanceId, | |
+ NativeMethods.DEVPROPKEY prop) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs | |
index 29a0bcd..e8158b3 100644 | |
--- a/DS4Windows/DS4Control/Mapping.cs | |
+++ b/DS4Windows/DS4Control/Mapping.cs | |
@@ -75,6 +75,74 @@ namespace DS4Windows | |
new Queue<ControlToXInput>(), new Queue<ControlToXInput>() | |
}; | |
+ struct DS4Vector2 | |
+ { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs | |
index 7af90bd..cd82824 100644 | |
--- a/DS4Windows/DS4Control/Mapping.cs | |
+++ b/DS4Windows/DS4Control/Mapping.cs | |
@@ -1579,11 +1579,16 @@ namespace DS4Windows | |
if (macroControl[24]) MappedState.RY = 0; | |
} | |
- if (getSASteeringWheelEmulationAxis(device) != SASteeringWheelEmulationAxisType.None) | |
+ if (GetSASteeringWheelEmulationAxis(device) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.Collections.Generic; | |
using System.Linq; | |
using System.Text; | |
using System.Threading.Tasks; | |
namespace DS4ImportTest | |
{ | |
class Tester | |
{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs | |
index f2b19d5..80e7408 100644 | |
--- a/DS4Windows/DS4Control/ControlService.cs | |
+++ b/DS4Windows/DS4Control/ControlService.cs | |
@@ -141,8 +141,43 @@ namespace DS4Windows | |
PreviousState[i] = new DS4State(); | |
ExposedState[i] = new DS4StateExposed(CurrentState[i]); | |
} | |
+ | |
+ boob = new ManualResetEvent(false); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs | |
index 3c4ff38..70a81b4 100644 | |
--- a/DS4Windows/DS4Control/ControlService.cs | |
+++ b/DS4Windows/DS4Control/ControlService.cs | |
@@ -828,7 +828,11 @@ namespace DS4Windows | |
if (getEnableTouchToggle(ind)) | |
CheckForTouchToggle(ind, cState, pState); | |
- cState = Mapping.SetCurveAndDeadzone(ind, cState, TempState[ind]); | |
+ cState = Mapping.SetCurveAndDeadzone(ind, cState, pState, TempState[ind]); |