The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-25 16:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small fizx to stick mapping

Browse Source
This commit is contained in:
jays2kings 2014-05-21 18:19:07 -04:00
parent 268defb6b9
commit c1d39f9cc5
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
DS4Control/Mapping.cs
View File

@ -399,10 +399,10 @@ namespace DS4Control
resetToDefaultValue(customButton.Key, MappedState); // erase default mappings for things that are remapped resetToDefaultValue(customButton.Key, MappedState); // erase default mappings for things that are remapped
foreach (KeyValuePair<DS4Controls, X360Controls> customButton in customButtons) foreach (KeyValuePair<DS4Controls, X360Controls> customButton in customButtons)
{ {
bool LXChanged = MappedState.LX == 127; bool LXChanged = (Math.Abs(127 - MappedState.LX) < 5);
bool LYChanged = MappedState.LY == 127; bool LYChanged = (Math.Abs(127 - MappedState.LY) < 5);
bool RXChanged = MappedState.RX == 127; bool RXChanged = (Math.Abs(127 - MappedState.RX) < 5);
bool RYChanged = MappedState.RY == 127; bool RYChanged = (Math.Abs(127 - MappedState.RY) < 5);
switch (customButton.Value) switch (customButton.Value)
{ {
case X360Controls.A: case X360Controls.A:
@ -468,63 +468,65 @@ namespace DS4Control
case X360Controls.LXNeg: case X360Controls.LXNeg:
if (LXChanged) if (LXChanged)
{ {
MappedState.LX = getXYAxisMapping(customButton.Key, cState, device); MappedState.LX = getXYAxisMapping(customButton.Key, cState);
LX = true; LX = true;
} }
break; break;
case X360Controls.LYNeg: case X360Controls.LYNeg:
if (LYChanged) if (LYChanged)
{ {
MappedState.LY = getXYAxisMapping(customButton.Key, cState, device); MappedState.LY = getXYAxisMapping(customButton.Key, cState);
LY = true; LY = true;
} }
break; break;
case X360Controls.RXNeg: case X360Controls.RXNeg:
if (RXChanged) if (RXChanged)
{ {
MappedState.RX = getXYAxisMapping(customButton.Key, cState, device); MappedState.RX = getXYAxisMapping(customButton.Key, cState);
RX = true; RX = true;
} }
break; break;
case X360Controls.RYNeg: case X360Controls.RYNeg:
if (RYChanged) if (RYChanged)
{ {
MappedState.RY = getXYAxisMapping(customButton.Key, cState, device); MappedState.RY = getXYAxisMapping(customButton.Key, cState);
RY = true; RY = true;
} }
break; break;
case X360Controls.LXPos: case X360Controls.LXPos:
if (LXChanged) if (LXChanged)
{ {
MappedState.LX = getXYAxisMapping(customButton.Key, cState, device, true); MappedState.LX = getXYAxisMapping(customButton.Key, cState, true);
LX = true; LX = true;
} }
break; break;
case X360Controls.LYPos: case X360Controls.LYPos:
if (LYChanged) if (LYChanged)
{ {
MappedState.LY = getXYAxisMapping(customButton.Key, cState, device, true); MappedState.LY = getXYAxisMapping(customButton.Key, cState, true);
LY = true; LY = true;
} }
break; break;
case X360Controls.RXPos: case X360Controls.RXPos:
if (RXChanged) if (RXChanged)
{ {
MappedState.RX = getXYAxisMapping(customButton.Key, cState, device, true); MappedState.RX = getXYAxisMapping(customButton.Key, cState, true);
RX = true; RX = true;
} }
break; break;
case X360Controls.RYPos: case X360Controls.RYPos:
if (RYChanged) if (RYChanged)
{ {
MappedState.RY = getXYAxisMapping(customButton.Key, cState, device, true); MappedState.RY = getXYAxisMapping(customButton.Key, cState, true);
RY = true; RY = true;
} }
break; break;
case X360Controls.LT: case X360Controls.LT:
if (MappedState.L2 == 0)
MappedState.L2 = getByteMapping(customButton.Key, cState); MappedState.L2 = getByteMapping(customButton.Key, cState);
break; break;
case X360Controls.RT: case X360Controls.RT:
if (MappedState.R2 == 0)
MappedState.R2 = getByteMapping(customButton.Key, cState); MappedState.R2 = getByteMapping(customButton.Key, cState);
break; break;
case X360Controls.LeftMouse: case X360Controls.LeftMouse:
@ -803,7 +805,7 @@ namespace DS4Control
return false; return false;
} }
public static byte getXYAxisMapping(DS4Controls control, DS4State cState, int ind, bool alt = false) public static byte getXYAxisMapping(DS4Controls control, DS4State cState, bool alt = false)
{ {
byte trueVal = 0; byte trueVal = 0;
byte falseVal = 127; byte falseVal = 127;
@ -854,13 +856,9 @@ namespace DS4Control
case DS4Controls.LYNeg: return cState.LY; case DS4Controls.LYNeg: return cState.LY;
case DS4Controls.RXNeg: return cState.RX; case DS4Controls.RXNeg: return cState.RX;
case DS4Controls.RYNeg: return cState.RY; case DS4Controls.RYNeg: return cState.RY;
//case DS4Controls.LXPos: return (byte)(cState.LX - 127 < Global.getLSDeadzone(ind) ? 0 : (255 - cState.LX));
//case DS4Controls.LYPos: return (byte)(cState.LY - 127 < Global.getLSDeadzone(ind) ? 0 : (255 - cState.LY));
case DS4Controls.RXPos: return (byte)(cState.RX - 127 < 55 ? 0 : (255 - cState.RX));
//case DS4Controls.RYPos: return (byte)(cState.RY - 127 < Global.getRSDeadzone(ind) ? 0 : (255 - cState.RY));
case DS4Controls.LXPos: return (byte)(255 - cState.LX); case DS4Controls.LXPos: return (byte)(255 - cState.LX);
case DS4Controls.LYPos: return (byte)(255 - cState.LY); case DS4Controls.LYPos: return (byte)(255 - cState.LY);
//case DS4Controls.RXPos: return (byte)(255 - cState.RX); case DS4Controls.RXPos: return (byte)(255 - cState.RX);
case DS4Controls.RYPos: return (byte)(255 - cState.RY); case DS4Controls.RYPos: return (byte)(255 - cState.RY);
} }
} }
@ -870,7 +868,7 @@ namespace DS4Control
{ {
case DS4Controls.LXNeg: return (byte)(255 - cState.LX); case DS4Controls.LXNeg: return (byte)(255 - cState.LX);
case DS4Controls.LYNeg: return (byte)(255 - cState.LY); case DS4Controls.LYNeg: return (byte)(255 - cState.LY);
case DS4Controls.RXNeg: return (byte)(cState.RX > 55 ? 0 : (255 - cState.RX)); case DS4Controls.RXNeg: return (byte)(255 - cState.RX);
case DS4Controls.RYNeg: return (byte)(255 - cState.RY); case DS4Controls.RYNeg: return (byte)(255 - cState.RY);
case DS4Controls.LXPos: return cState.LX; case DS4Controls.LXPos: return cState.LX;
case DS4Controls.LYPos: return cState.LY; case DS4Controls.LYPos: return cState.LY;

2
DS4Tool/ScpForm.cs
View File

@ -14,7 +14,7 @@ namespace ScpServer
{ {
private DS4Control.Control rootHub; private DS4Control.Control rootHub;
delegate void LogDebugDelegate(DateTime Time, String Data); delegate void LogDebugDelegate(DateTime Time, String Data);
double version = 7.3; double version = 7.31;
protected Label[] Pads; protected Label[] Pads;
protected ComboBox[] cbs; protected ComboBox[] cbs;