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 code cleanups in special actions (Macro)

Browse Source
This commit is contained in:
mika-n 2019-08-12 00:22:54 +03:00
parent 45bfd2043a
commit af6bbb517a
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DS4Windows/DS4Control/Mapping.cs
View File

@ -1241,12 +1241,11 @@ namespace DS4Windows
bool active = getBoolMapping2(device, dcs.control, cState, eState, tp, fieldMapping); bool active = getBoolMapping2(device, dcs.control, cState, eState, tp, fieldMapping);
if (active) if (active)
{ {
//PlayMacro(device, macroControl, string.Join("/", (int[])action), dcs.control, keyType);
PlayMacro(device, macroControl, String.Empty, null, (int[])action, dcs.control, keyType); PlayMacro(device, macroControl, String.Empty, null, (int[])action, dcs.control, keyType);
} }
else else
{ {
EndMacro(device, macroControl, /*string.Join("/",*/ (int[])action /*)*/, dcs.control); EndMacro(device, macroControl, (int[])action, dcs.control);
} }
// erase default mappings for things that are remapped // erase default mappings for things that are remapped
@ -1790,7 +1789,6 @@ namespace DS4Windows
resetToDefaultValue2(dc, MappedState, outputfieldMapping); resetToDefaultValue2(dc, MappedState, outputfieldMapping);
} }
//AppLogger.LogToGui($"DEBUG: PlayMacro={String.Join("/", action.macro)} trigger={action.controls}", false);
PlayMacro(device, macroControl, String.Empty, action.macro, null, DS4Controls.None, keyType, action, actionDone[index]); PlayMacro(device, macroControl, String.Empty, action.macro, null, DS4Controls.None, keyType, action, actionDone[index]);
} }
else else
@ -1815,9 +1813,7 @@ namespace DS4Windows
resetToDefaultValue2(dc, MappedState, outputfieldMapping); resetToDefaultValue2(dc, MappedState, outputfieldMapping);
} }
//AppLogger.LogToGui($"DEBUG: pressRelease PlayMacro={String.Join("/", action.macro)} trigger={action.controls}", false);
PlayMacro(device, macroControl, String.Empty, action.macro, null, DS4Controls.None, keyType, action, null); PlayMacro(device, macroControl, String.Empty, action.macro, null, DS4Controls.None, keyType, action, null);
//EndMacro(device, macroControl, action.macro, DS4Controls.None);
} }
} }
else else
@ -2078,7 +2074,6 @@ namespace DS4Windows
if ((DateTime.UtcNow - action.TimeofEnd) > TimeSpan.FromMilliseconds(150)) if ((DateTime.UtcNow - action.TimeofEnd) > TimeSpan.FromMilliseconds(150))
{ {
if (macro != "") if (macro != "")
//PlayMacro(device, macroControl, macro, DS4Controls.None, DS4KeyType.None);
PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None); PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None);
tappedOnce = false; tappedOnce = false;
@ -2105,7 +2100,6 @@ namespace DS4Windows
} }
if (macro != "") if (macro != "")
//PlayMacro(device, macroControl, macro, DS4Controls.None, DS4KeyType.None);
PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None); PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None);
firstTouch = false; firstTouch = false;
@ -2130,7 +2124,6 @@ namespace DS4Windows
} }
if (macro != "") if (macro != "")
//PlayMacro(device, macroControl, macro, DS4Controls.None, DS4KeyType.None);
PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None); PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None);
secondtouchbegin = false; secondtouchbegin = false;