mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2025-02-17 00:16:20 +01:00
Only take active binding into account for multiple binds. Fixes ATS profile.
This commit is contained in:
parent
49c7ee35cf
commit
fc40e00846
@ -1520,21 +1520,26 @@ namespace DS4Windows
|
|||||||
DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[tempOutControl];
|
DS4StateFieldMapping.ControlType controlType = DS4StateFieldMapping.mappedType[tempOutControl];
|
||||||
bool alt = controlType == DS4StateFieldMapping.ControlType.AxisDir && tempOutControl % 2 == 0 ? true : false;
|
bool alt = controlType == DS4StateFieldMapping.ControlType.AxisDir && tempOutControl % 2 == 0 ? true : false;
|
||||||
byte axisMapping = getXYAxisMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping, alt);
|
byte axisMapping = getXYAxisMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping, alt);
|
||||||
int controlRelation = tempOutControl % 2 == 0 ? tempOutControl - 1 : tempOutControl + 1;
|
if (axisMapping != 128)
|
||||||
outputfieldMapping.axisdirs[tempOutControl] = axisMapping;
|
{
|
||||||
outputfieldMapping.axisdirs[controlRelation] = axisMapping;
|
int controlRelation = tempOutControl % 2 == 0 ? tempOutControl - 1 : tempOutControl + 1;
|
||||||
|
outputfieldMapping.axisdirs[tempOutControl] = axisMapping;
|
||||||
|
outputfieldMapping.axisdirs[controlRelation] = axisMapping;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (tempMap.xoutput == DS4Controls.L2 || tempMap.xoutput == DS4Controls.R2)
|
if (tempMap.xoutput == DS4Controls.L2 || tempMap.xoutput == DS4Controls.R2)
|
||||||
{
|
{
|
||||||
byte axisMapping = getByteMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping);
|
byte axisMapping = getByteMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping);
|
||||||
outputfieldMapping.triggers[tempOutControl] = axisMapping;
|
if (axisMapping != 0)
|
||||||
|
outputfieldMapping.triggers[tempOutControl] = axisMapping;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
bool value = getBoolMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping);
|
bool value = getBoolMapping2(device, tempMap.ds4input, cState, eState, tp, fieldMapping);
|
||||||
outputfieldMapping.buttons[tempOutControl] = value;
|
if (value)
|
||||||
|
outputfieldMapping.buttons[tempOutControl] = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user