Merge branch 'mika-n-jay' into jay

DS4Windows/DS4Control/Mapping.cs

@@ -191,6 +191,7 @@ namespace DS4Windows
         public static bool[] pressedonce = new bool[261], macrodone = new bool[38];
         static bool[] macroControl = new bool[25];
         static uint macroCount = 0;
+        static Dictionary<string, Task>[] macroTaskQueue = new Dictionary<string, Task>[4] { new Dictionary<string, Task>(), new Dictionary<string, Task>(), new Dictionary<string, Task>(), new Dictionary<string, Task>() };
 
         //actions
         public static int[] fadetimer = new int[4] { 0, 0, 0, 0 };
@@ -1562,11 +1563,11 @@ namespace DS4Windows
                         bool active = getBoolMapping2(device, dcs.control, cState, eState, tp, fieldMapping);
                         if (active)
                         {
-                            PlayMacro(device, macroControl, string.Join("/", (int[])action), dcs.control, keyType);
+                            PlayMacro(device, macroControl, String.Empty, null, (int[])action, dcs.control, keyType);
                         }
                         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
@@ -2001,6 +2002,10 @@ namespace DS4Windows
                                     break;
                                 }
                             }
+
+                            // If special action macro is set to run on key release then activate the trigger status only when the trigger key is released
+                            if (action.typeID == SpecialAction.ActionTypeId.Macro && action.pressRelease && action.firstTouch)
+                                triggeractivated = !triggeractivated;
                         }
 
                         bool utriggeractivated = true;
@@ -2095,22 +2100,49 @@ namespace DS4Windows
                             else if (action.typeID == SpecialAction.ActionTypeId.Macro)
                             {
                                 actionFound = true;
-
+                                if (!action.pressRelease)
+                                {
+                                    // Macro run when trigger keys are pressed down (the default behaviour)
                                     if (!actionDone[index].dev[device])
                                     {
                                         DS4KeyType keyType = action.keyType;
                                         actionDone[index].dev[device] = true;
-                                    //foreach (DS4Controls dc in action.trigger)
                                         for (int i = 0, arlen = action.trigger.Count; i < arlen; i++)
                                         {
                                             DS4Controls dc = action.trigger[i];
                                             resetToDefaultValue2(dc, MappedState, outputfieldMapping);
                                         }
 
-                                    PlayMacro(device, macroControl, String.Join("/", action.macro), DS4Controls.None, keyType);
+                                        PlayMacro(device, macroControl, String.Empty, action.macro, null, DS4Controls.None, keyType, action, actionDone[index]);
                                     }
                                     else
-                                    EndMacro(device, macroControl, String.Join("/", action.macro), DS4Controls.None);
+                                    {
+                                        if (!action.keyType.HasFlag(DS4KeyType.RepeatMacro))
+                                            EndMacro(device, macroControl, action.macro, DS4Controls.None);
+                                    }
+                                }
+                                else 
+                                {
+                                    // Macro is run when trigger keys are released (optional behaviour of macro special action))
+                                    if (action.firstTouch)
+                                    {
+                                        action.firstTouch = false;
+                                        if (!actionDone[index].dev[device])
+                                        {
+                                            DS4KeyType keyType = action.keyType;
+                                            actionDone[index].dev[device] = true;
+                                            for (int i = 0, arlen = action.trigger.Count; i < arlen; i++)
+                                            {
+                                                DS4Controls dc = action.trigger[i];
+                                                resetToDefaultValue2(dc, MappedState, outputfieldMapping);
+                                            }
+
+                                            PlayMacro(device, macroControl, String.Empty, action.macro, null, DS4Controls.None, keyType, action, null);
+                                        }
+                                    }
+                                    else
+                                        action.firstTouch = true;
+                                }
                             }
                             else if (action.typeID == SpecialAction.ActionTypeId.Key)
                             {
@@ -2366,7 +2398,7 @@ namespace DS4Windows
                                     if ((DateTime.UtcNow - action.TimeofEnd) > TimeSpan.FromMilliseconds(150))
                                     {
                                         if (macro != "")
-                                            PlayMacro(device, macroControl, macro, DS4Controls.None, DS4KeyType.None);
+                                            PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None);
 
                                         tappedOnce = false;
                                         action.tappedOnce = false;
@@ -2392,7 +2424,7 @@ namespace DS4Windows
                                     }
 
                                     if (macro != "")
-                                        PlayMacro(device, macroControl, macro, DS4Controls.None, DS4KeyType.None);
+                                        PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None);
 
                                     firstTouch = false;
                                     action.firstTouch = false;
@@ -2416,7 +2448,7 @@ namespace DS4Windows
                                     }
 
                                     if (macro != "")
-                                        PlayMacro(device, macroControl, macro, DS4Controls.None, DS4KeyType.None);
+                                        PlayMacro(device, macroControl, macro, null, null, DS4Controls.None, DS4KeyType.None);
 
                                     secondtouchbegin = false;
                                     action.secondtouchbegin = false;
@@ -2516,51 +2548,180 @@ namespace DS4Windows
             }
         }
 
-        private static async void PlayMacro(int device, bool[] macrocontrol, string macro, DS4Controls control, DS4KeyType keyType)
+        // Play macro as a background task. Optionally the new macro play waits for completion of a previous macro execution (synchronized macro special action). 
+        // Macro steps are defined either as macrostr string value, macroLst list<int> object or as macroArr integer array. Only one of these should have a valid macro definition when this method is called.
+        // If the macro definition is a macroStr string value then it will be converted as integer array on the fl. If steps are already defined as list or array of integers then there is no need to do type cast conversion.
+        private static void PlayMacro(int device, bool[] macrocontrol, string macroStr, List<int> macroLst, int[] macroArr, DS4Controls control, DS4KeyType keyType, SpecialAction action = null, ActionState actionDoneState = null)
         {
-            if (macro.StartsWith("164/9/9/164") || macro.StartsWith("18/9/9/18"))
+            if (action != null && action.synchronized)
+            {
+                // Run special action macros in synchronized order (ie. FirstIn-FirstOut). The trigger control name string is the execution queue identifier (ie. each unique trigger combination has an own synchronization queue).
+                if (!macroTaskQueue[device].TryGetValue(action.controls, out Task prevTask))
+                    macroTaskQueue[device].Add(action.controls, (Task.Factory.StartNew(() => PlayMacroTask(device, macroControl, macroStr, macroLst, macroArr, control, keyType, action, actionDoneState))) );
+                else
+                    macroTaskQueue[device][action.controls] = prevTask.ContinueWith((x) => PlayMacroTask(device, macroControl, macroStr, macroLst, macroArr, control, keyType, action, actionDoneState));                       
+            }
+            else
+                // Run macro as "fire and forget" background task. No need to wait for completion of any of the other macros. 
+                // If the same trigger macro is re-launched while previous macro is still running then the order of parallel macros is not guaranteed.
+                Task.Factory.StartNew(() => PlayMacroTask(device, macroControl, macroStr, macroLst, macroArr, control, keyType, action, actionDoneState));
+        }
+
+        // Play through a macro. The macro steps are defined either as string, List or Array object (always only one of those parameters is set to a valid value)
+        private static void PlayMacroTask(int device, bool[] macrocontrol, string macroStr, List<int> macroLst, int[] macroArr, DS4Controls control, DS4KeyType keyType, SpecialAction action, ActionState actionDoneState)
+        {
+            if(!String.IsNullOrEmpty(macroStr))
             {
                 string[] skeys;
-                int wait = 1000;
+
-                if (!string.IsNullOrEmpty(macro))
+                skeys = macroStr.Split('/');
-                {
+                macroArr = new int[skeys.Length];
-                    skeys = macro.Split('/');
+                for (int i = 0; i < macroArr.Length; i++)
-                    ushort delay;
+                    macroArr[i] = int.Parse(skeys[i]);
-                    if (ushort.TryParse(skeys[skeys.Length - 1], out delay) && delay > 300)
-                        wait = delay - 300;
             }
+
+            // macro.StartsWith("164/9/9/164") || macro.StartsWith("18/9/9/18")
+            if ( (macroLst != null && macroLst.Count >= 4 && ((macroLst[0] == 164 && macroLst[1] == 9 && macroLst[2] == 9 && macroLst[3] == 164) || (macroLst[0] == 18 && macroLst[1] == 9 && macroLst[2] == 9 && macroLst[3] == 18))) 
+              || (macroArr != null && macroArr.Length>= 4 && ((macroArr[0] == 164 && macroArr[1] == 9 && macroArr[2] == 9 && macroArr[3] == 164) || (macroArr[0] == 18 && macroArr[1] == 9 && macroArr[2] == 9 && macroArr[3] == 18)))
+            )
+            {
+                int wait;
+                if(macroLst != null)
+                    wait = macroLst[macroLst.Count - 1];
+                else
+                    wait = macroArr[macroArr.Length - 1];
+
+                if (wait <= 300 || wait > ushort.MaxValue)
+                    wait = 1000;
+                else
+                    wait -= 300;
+
                 AltTabSwapping(wait, device);
                 if (control != DS4Controls.None)
                     macrodone[DS4ControltoInt(control)] = true;
             }
-            else
+            else if(control == DS4Controls.None || !macrodone[DS4ControltoInt(control)])
             {
-                string[] skeys;
+                int macroCodeValue;
-                int[] keys;
-                if (!string.IsNullOrEmpty(macro))
-                {
-                    skeys = macro.Split('/');
-                    keys = new int[skeys.Length];
-                }
-                else
-                {
-                    skeys = new string[0];
-                    keys = new int[0];
-                }
-                for (int i = 0; i < keys.Length; i++)
-                    keys[i] = int.Parse(skeys[i]);
                 bool[] keydown = new bool[286];
-                if (control == DS4Controls.None || !macrodone[DS4ControltoInt(control)])
+
-                {
                 if (control != DS4Controls.None)
                     macrodone[DS4ControltoInt(control)] = true;
-                    foreach (int i in keys)
+
+                // Play macro codes and simulate key down/up events (note! The same key may go through several up and down events during the same macro).
+                // If the return value is TRUE then this method should do a asynchronized delay (the usual Thread.Sleep doesnt work here because it would block the main gamepad reading thread).
+                if (macroLst != null)
                 {
-                        if (i >= 1000000000)
+                    for (int i = 0; i < macroLst.Count; i++)
                     {
-                            string lb = i.ToString().Substring(1);
+                        macroCodeValue = macroLst[i];
-                            if (i > 1000000000)
+                        if (PlayMacroCodeValue(device, macrocontrol, keyType, macroCodeValue, keydown))
+                            Task.Delay(macroCodeValue - 300).Wait();
+                    }
+                }
+                else
                 {
+                    for (int i = 0; i < macroArr.Length; i++)
+                    {
+                        macroCodeValue = macroArr[i];
+                        if (PlayMacroCodeValue(device, macrocontrol, keyType, macroCodeValue, keydown))
+                            Task.Delay(macroCodeValue - 300).Wait();
+                    }
+                }
+
+                // The macro is finished. If any of the keys is still in down state then release a key state (ie. simulate key up event) unless special action specified to keep the last state as it is left in a macro
+                if (action == null || !action.keepKeyState)
+                {
+                    for (int i = 0, arlength = keydown.Length; i < arlength; i++)
+                    {
+                        if (keydown[i])
+                            PlayMacroCodeValue(device, macrocontrol, keyType, i, keydown);
+                    }
+                }
+
+                DS4LightBar.forcedFlash[device] = 0;
+                DS4LightBar.forcelight[device] = false;
+
+                // Commented out rumble reset. No need to zero out rumble after a macro because it may conflict with a game generated rumble events (ie. macro would stop a game generated rumble effect).
+                // If macro generates rumble effects then the macro can stop the rumble as a last step or wait for rumble watchdog timer to do it after few seconds.
+                //Program.rootHub.DS4Controllers[device].setRumble(0, 0);
+
+                if (keyType.HasFlag(DS4KeyType.HoldMacro))
+                {
+                    Task.Delay(50).Wait();
+                    if (control != DS4Controls.None)
+                        macrodone[DS4ControltoInt(control)] = false;
+                }
+            }
+
+            // If a special action type of Macro has "Repeat while held" option and actionDoneState object is defined then reset the action back to "not done" status in order to re-fire it if the trigger key is still held down
+            if (actionDoneState != null && keyType.HasFlag(DS4KeyType.RepeatMacro))
+                actionDoneState.dev[device] = false;
+        }
+
+        private static bool PlayMacroCodeValue(int device, bool[] macrocontrol, DS4KeyType keyType, int macroCodeValue, bool[] keydown)
+        {
+            bool doDelayOnCaller = false;
+            if (macroCodeValue >= 261 && macroCodeValue <= 285)
+            {
+                // Gamepad button up or down macro event. macroCodeValue index value is the button identifier (codeValue-261 = idx in 0..24 range)
+                if (!keydown[macroCodeValue])
+                {
+                    macroControl[macroCodeValue - 261] = keydown[macroCodeValue] = true;
+                    macroCount++;
+                }
+                else
+                {
+                    macroControl[macroCodeValue - 261] = keydown[macroCodeValue] = false;
+                    if (macroCount > 0) macroCount--;
+                }
+            }
+            else if (macroCodeValue < 300)
+            {
+                // Keyboard key or mouse button macro event
+                if (!keydown[macroCodeValue])
+                {
+                    switch (macroCodeValue)
+                    {
+                        //anything above 255 is not a keyvalue
+                        case 256: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTDOWN); break;
+                        case 257: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTDOWN); break;
+                        case 258: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_MIDDLEDOWN); break;
+                        case 259: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONDOWN, 1); break;
+                        case 260: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONDOWN, 2); break;
+
+                        default:
+                            if (keyType.HasFlag(DS4KeyType.ScanCode)) InputMethods.performSCKeyPress((ushort)macroCodeValue);
+                            else InputMethods.performKeyPress((ushort)macroCodeValue);
+                            break;
+                    }
+                    keydown[macroCodeValue] = true;
+                }
+                else
+                {
+                    switch (macroCodeValue)
+                    {
+                        //anything above 255 is not a keyvalue
+                        case 256: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTUP); break;
+                        case 257: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTUP); break;
+                        case 258: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_MIDDLEUP); break;
+                        case 259: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONUP, 1); break;
+                        case 260: InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONUP, 2); break;
+
+                        default:
+                            if (keyType.HasFlag(DS4KeyType.ScanCode)) InputMethods.performSCKeyRelease((ushort)macroCodeValue);
+                            else InputMethods.performKeyRelease((ushort)macroCodeValue);
+                            break;
+                    }
+                    keydown[macroCodeValue] = false;
+                }
+            }
+            else if (macroCodeValue >= 1000000000)
+            {
+                // Lightbar color event
+                if (macroCodeValue > 1000000000)
+                {
+                    string lb = macroCodeValue.ToString().Substring(1);
                     byte r = (byte)(int.Parse(lb[0].ToString()) * 100 + int.Parse(lb[1].ToString()) * 10 + int.Parse(lb[2].ToString()));
                     byte g = (byte)(int.Parse(lb[3].ToString()) * 100 + int.Parse(lb[4].ToString()) * 10 + int.Parse(lb[5].ToString()));
                     byte b = (byte)(int.Parse(lb[6].ToString()) * 100 + int.Parse(lb[7].ToString()) * 10 + int.Parse(lb[8].ToString()));
@@ -2574,145 +2735,22 @@ namespace DS4Windows
                     DS4LightBar.forcelight[device] = false;
                 }
             }
-                        else if (i >= 1000000)
+            else if (macroCodeValue >= 1000000)
             {
+                // Rumble event
                 DS4Device d = Program.rootHub.DS4Controllers[device];
-                            string r = i.ToString().Substring(1);
+                string r = macroCodeValue.ToString().Substring(1);
                 byte heavy = (byte)(int.Parse(r[0].ToString()) * 100 + int.Parse(r[1].ToString()) * 10 + int.Parse(r[2].ToString()));
                 byte light = (byte)(int.Parse(r[3].ToString()) * 100 + int.Parse(r[4].ToString()) * 10 + int.Parse(r[5].ToString()));
                 d.setRumble(light, heavy);
             }
-                        else if (i >= 300) //ints over 300 used to delay
-                            await Task.Delay(i - 300);
-                        else if (!keydown[i])
-                        {
-                            if (i == 256) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTDOWN); //anything above 255 is not a keyvalue
-                            else if (i == 257) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTDOWN);
-                            else if (i == 258) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_MIDDLEDOWN);
-                            else if (i == 259) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONDOWN, 1);
-                            else if (i == 260) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONDOWN, 2);
-                            else if (i == 261) { macroControl[0] = true; macroCount++; }
-                            else if (i == 262) { macroControl[1] = true; macroCount++; }
-                            else if (i == 263) { macroControl[2] = true; macroCount++; }
-                            else if (i == 264) { macroControl[3] = true; macroCount++; }
-                            else if (i == 265) { macroControl[4] = true; macroCount++; }
-                            else if (i == 266) { macroControl[5] = true; macroCount++; }
-                            else if (i == 267) { macroControl[6] = true; macroCount++; }
-                            else if (i == 268) { macroControl[7] = true; macroCount++; }
-                            else if (i == 269) { macroControl[8] = true; macroCount++; }
-                            else if (i == 270) { macroControl[9] = true; macroCount++; }
-                            else if (i == 271) { macroControl[10] = true; macroCount++; }
-                            else if (i == 272) { macroControl[11] = true; macroCount++; }
-                            else if (i == 273) { macroControl[12] = true; macroCount++; }
-                            else if (i == 274) { macroControl[13] = true; macroCount++; }
-                            else if (i == 275) { macroControl[14] = true; macroCount++; }
-                            else if (i == 276) { macroControl[15] = true; macroCount++; }
-                            else if (i == 277) { macroControl[16] = true; macroCount++; }
-                            else if (i == 278) { macroControl[17] = true; macroCount++; }
-                            else if (i == 279) { macroControl[18] = true; macroCount++; }
-                            else if (i == 280) { macroControl[19] = true; macroCount++; }
-                            else if (i == 281) { macroControl[20] = true; macroCount++; }
-                            else if (i == 282) { macroControl[21] = true; macroCount++; }
-                            else if (i == 283) { macroControl[22] = true; macroCount++; }
-                            else if (i == 284) { macroControl[23] = true;macroCount++; }
-                            else if (i == 285) { macroControl[24] = true; macroCount++; }
-                            else if (keyType.HasFlag(DS4KeyType.ScanCode))
-                                InputMethods.performSCKeyPress((ushort)i);
-                            else
-                                InputMethods.performKeyPress((ushort)i);
-                            keydown[i] = true;
-                        }
             else
             {
-                            if (i == 256) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTUP); //anything above 255 is not a keyvalue
+                // Delay specification. Indicate to caller that it should do a delay of macroCodeValue-300 msecs
-                            else if (i == 257) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTUP);
+                doDelayOnCaller = true;
-                            else if (i == 258) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_MIDDLEUP);
-                            else if (i == 259) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONUP, 1);
-                            else if (i == 260) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONUP, 2);
-                            else if (i == 261) { macroControl[0] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 262) { macroControl[1] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 263) { macroControl[2] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 264) { macroControl[3] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 265) { macroControl[4] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 266) { macroControl[5] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 267) { macroControl[6] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 268) { macroControl[7] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 269) { macroControl[8] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 270) { macroControl[9] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 271) { macroControl[10] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 272) { macroControl[11] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 273) { macroControl[12] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 274) { macroControl[13] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 275) { macroControl[14] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 276) { macroControl[15] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 277) { macroControl[16] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 278) { macroControl[17] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 279) { macroControl[18] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 280) { macroControl[19] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 281) { macroControl[20] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 282) { macroControl[21] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 283) { macroControl[22] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 284) { macroControl[23] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 285) { macroControl[24] = false; if (macroCount > 0) macroCount--; }
-                            else if (keyType.HasFlag(DS4KeyType.ScanCode))
-                                InputMethods.performSCKeyRelease((ushort)i);
-                            else
-                                InputMethods.performKeyRelease((ushort)i);
-                            keydown[i] = false;
-                        }
-                    }
-                    for (int i = 0, arlength = keydown.Length; i < arlength; i++)
-                    {
-                        if (keydown[i])
-                        {
-                            if (i == 256) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_LEFTUP); //anything above 255 is not a keyvalue
-                            else if (i == 257) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_RIGHTUP);
-                            else if (i == 258) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_MIDDLEUP);
-                            else if (i == 259) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONUP, 1);
-                            else if (i == 260) InputMethods.MouseEvent(InputMethods.MOUSEEVENTF_XBUTTONUP, 2);
-                            else if (i == 261) { macroControl[0] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 262) { macroControl[1] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 263) { macroControl[2] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 264) { macroControl[3] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 265) { macroControl[4] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 266) { macroControl[5] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 267) { macroControl[6] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 268) { macroControl[7] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 269) { macroControl[8] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 270) { macroControl[9] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 271) { macroControl[10] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 272) { macroControl[11] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 273) { macroControl[12] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 274) { macroControl[13] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 275) { macroControl[14] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 276) { macroControl[15] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 277) { macroControl[16] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 278) { macroControl[17] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 279) { macroControl[18] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 280) { macroControl[19] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 281) { macroControl[20] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 282) { macroControl[21] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 283) { macroControl[22] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 284) { macroControl[23] = false; if (macroCount > 0) macroCount--; }
-                            else if (i == 285) { macroControl[24] = false; if (macroCount > 0) macroCount--; }
-                            else if (keyType.HasFlag(DS4KeyType.ScanCode))
-                                InputMethods.performSCKeyRelease((ushort)i);
-                            else
-                                InputMethods.performKeyRelease((ushort)i);
-                        }
             }
 
-                    DS4LightBar.forcedFlash[device] = 0;
+            return doDelayOnCaller;
-                    DS4LightBar.forcelight[device] = false;
-                    Program.rootHub.DS4Controllers[device].setRumble(0, 0);
-                    if (keyType.HasFlag(DS4KeyType.HoldMacro))
-                    {
-                        await Task.Delay(50);
-                        if (control != DS4Controls.None)
-                            macrodone[DS4ControltoInt(control)] = false;
-                    }
-                }
-            }
         }
 
         private static void EndMacro(int device, bool[] macrocontrol, string macro, DS4Controls control)
@@ -2724,6 +2762,24 @@ namespace DS4Windows
                 macrodone[DS4ControltoInt(control)] = false;
         }
 
+        private static void EndMacro(int device, bool[] macrocontrol, List<int> macro, DS4Controls control)
+        {
+            if(macro.Count >= 4 && ((macro[0] == 164 && macro[1] == 9 && macro[2] == 9 && macro[3] == 164) || (macro[0] == 18 && macro[1] == 9 && macro[2] == 9 && macro[3] == 18)) && !altTabDone)
+                AltTabSwappingRelease();
+
+            if (control != DS4Controls.None)
+                macrodone[DS4ControltoInt(control)] = false;
+        }
+
+        private static void EndMacro(int device, bool[] macrocontrol, int[] macro, DS4Controls control)
+        {
+            if (macro.Length >= 4 && ((macro[0] == 164 && macro[1] == 9 && macro[2] == 9 && macro[3] == 164) || (macro[0] == 18 && macro[1] == 9 && macro[2] == 9 && macro[3] == 18)) && !altTabDone)
+                AltTabSwappingRelease();
+
+            if (control != DS4Controls.None)
+                macrodone[DS4ControltoInt(control)] = false;
+        }
+
         private static void AltTabSwapping(int wait, int device)
         {
             if (altTabDone)

DS4Windows/DS4Control/ScpUtil.cs

@@ -4412,6 +4412,8 @@ namespace DS4Windows
         public DateTime TimeofEnd;
         public bool automaticUntrigger = false;
         public string prevProfileName;  // Name of the previous profile where automaticUntrigger would jump back to (could be regular or temporary profile. Empty name is the same as regular profile)
+        public bool synchronized = false; // If the same trigger has both "key down" and "key released" macros then run those synchronized if this attribute is TRUE (ie. key down macro fully completed before running the key release macro)
+        public bool keepKeyState = false; // By default special action type "Macro" resets all keys used in the macro back to default "key up" state after completing the macro even when the macro itself doesn't do it explicitly. If this is TRUE then key states are NOT reset automatically (macro is expected to do it or to leave a key to down state on purpose)
 
         public SpecialAction(string name, string controls, string type, string details, double delay = 0, string extras = "")
         {
@@ -4468,6 +4470,14 @@ namespace DS4Windows
                 }
                 if (extras.Contains("Scan Code"))
                     keyType |= DS4KeyType.ScanCode;
+                if (extras.Contains("RunOnRelease"))
+                    pressRelease = true;
+                if (extras.Contains("Sync"))
+                    synchronized = true;
+                if (extras.Contains("KeepKeyState"))
+                    keepKeyState = true;
+                if (extras.Contains("Repeat"))
+                    keyType |= DS4KeyType.RepeatMacro;
             }
             else if (type == "DisconnectBT")
             {

DS4Windows/DS4Forms/SpecActions.Designer.cs

@@ -55,9 +55,14 @@
             this.lbHoldForProg = new System.Windows.Forms.Label();
             this.lbSecsProg = new System.Windows.Forms.Label();
             this.pnlMacro = new System.Windows.Forms.Panel();
+            this.cBMacroRepeat = new System.Windows.Forms.CheckBox();
+            this.cBMacroKeepKeyState = new System.Windows.Forms.CheckBox();
+            this.cBMacroSyncRun = new System.Windows.Forms.CheckBox();
+            this.cBMacroRunOnRelease = new System.Windows.Forms.CheckBox();
             this.cBMacroScanCode = new System.Windows.Forms.CheckBox();
             this.lbMacroRecorded = new System.Windows.Forms.Label();
             this.pnlProfile = new System.Windows.Forms.Panel();
+            this.cbProfileAutoUntrigger = new System.Windows.Forms.CheckBox();
             this.lbUnloadTipProfile = new System.Windows.Forms.Label();
             this.pnlDisconnectBT = new System.Windows.Forms.Panel();
             this.nUDDCBT = new System.Windows.Forms.NumericUpDown();
@@ -86,7 +91,7 @@
             this.lbDTapDVR = new System.Windows.Forms.Label();
             this.lbHoldDVR = new System.Windows.Forms.Label();
             this.lbTapDVR = new System.Windows.Forms.Label();
-            this.cbProfileAutoUntrigger = new System.Windows.Forms.CheckBox();
+            this.tp = new System.Windows.Forms.ToolTip(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.pBProgram)).BeginInit();
             this.pnlProgram.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.nUDProg)).BeginInit();
@@ -365,12 +370,40 @@
             // 
             // pnlMacro
             // 
+            this.pnlMacro.Controls.Add(this.cBMacroRepeat);
+            this.pnlMacro.Controls.Add(this.cBMacroKeepKeyState);
+            this.pnlMacro.Controls.Add(this.cBMacroSyncRun);
+            this.pnlMacro.Controls.Add(this.cBMacroRunOnRelease);
             this.pnlMacro.Controls.Add(this.cBMacroScanCode);
             this.pnlMacro.Controls.Add(this.btnRecordMacro);
             this.pnlMacro.Controls.Add(this.lbMacroRecorded);
             resources.ApplyResources(this.pnlMacro, "pnlMacro");
             this.pnlMacro.Name = "pnlMacro";
             // 
+            // cBMacroRepeat
+            // 
+            resources.ApplyResources(this.cBMacroRepeat, "cBMacroRepeat");
+            this.cBMacroRepeat.Name = "cBMacroRepeat";
+            this.cBMacroRepeat.UseVisualStyleBackColor = true;
+            // 
+            // cBMacroKeepKeyState
+            // 
+            resources.ApplyResources(this.cBMacroKeepKeyState, "cBMacroKeepKeyState");
+            this.cBMacroKeepKeyState.Name = "cBMacroKeepKeyState";
+            this.cBMacroKeepKeyState.UseVisualStyleBackColor = true;
+            // 
+            // cBMacroSyncRun
+            // 
+            resources.ApplyResources(this.cBMacroSyncRun, "cBMacroSyncRun");
+            this.cBMacroSyncRun.Name = "cBMacroSyncRun";
+            this.cBMacroSyncRun.UseVisualStyleBackColor = true;
+            // 
+            // cBMacroRunOnRelease
+            // 
+            resources.ApplyResources(this.cBMacroRunOnRelease, "cBMacroRunOnRelease");
+            this.cBMacroRunOnRelease.Name = "cBMacroRunOnRelease";
+            this.cBMacroRunOnRelease.UseVisualStyleBackColor = true;
+            // 
             // cBMacroScanCode
             // 
             resources.ApplyResources(this.cBMacroScanCode, "cBMacroScanCode");
@@ -391,6 +424,12 @@
             resources.ApplyResources(this.pnlProfile, "pnlProfile");
             this.pnlProfile.Name = "pnlProfile";
             // 
+            // cbProfileAutoUntrigger
+            // 
+            resources.ApplyResources(this.cbProfileAutoUntrigger, "cbProfileAutoUntrigger");
+            this.cbProfileAutoUntrigger.Name = "cbProfileAutoUntrigger";
+            this.cbProfileAutoUntrigger.UseVisualStyleBackColor = true;
+            // 
             // lbUnloadTipProfile
             // 
             resources.ApplyResources(this.lbUnloadTipProfile, "lbUnloadTipProfile");
@@ -598,17 +637,12 @@
             resources.ApplyResources(this.lbTapDVR, "lbTapDVR");
             this.lbTapDVR.Name = "lbTapDVR";
             // 
-            // cbProfileAutoUntrigger
-            // 
-            resources.ApplyResources(this.cbProfileAutoUntrigger, "cbProfileAutoUntrigger");
-            this.cbProfileAutoUntrigger.Name = "cbProfileAutoUntrigger";
-            this.cbProfileAutoUntrigger.UseVisualStyleBackColor = true;
-            // 
             // SpecActions
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
+            this.Controls.Add(this.pnlMacro);
             this.Controls.Add(this.pnlGameDVR);
             this.Controls.Add(this.tBName);
             this.Controls.Add(this.cBActions);
@@ -619,7 +653,6 @@
             this.Controls.Add(this.lVUnloadTrigger);
             this.Controls.Add(this.btnBorder);
             this.Controls.Add(this.pnlKeys);
-            this.Controls.Add(this.pnlMacro);
             this.Controls.Add(this.pnlProfile);
             this.Controls.Add(this.pnlProgram);
             this.Controls.Add(this.pnlBatteryCheck);
@@ -633,6 +666,7 @@
             this.pnlMacro.ResumeLayout(false);
             this.pnlMacro.PerformLayout();
             this.pnlProfile.ResumeLayout(false);
+            this.pnlProfile.PerformLayout();
             this.pnlDisconnectBT.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.nUDDCBT)).EndInit();
             this.pnlKeys.ResumeLayout(false);
@@ -707,5 +741,10 @@
         public System.Windows.Forms.Button btnHoldT;
         public System.Windows.Forms.Button btnSTapT;
         private System.Windows.Forms.CheckBox cbProfileAutoUntrigger;
+        private System.Windows.Forms.CheckBox cBMacroKeepKeyState;
+        private System.Windows.Forms.CheckBox cBMacroSyncRun;
+        private System.Windows.Forms.CheckBox cBMacroRunOnRelease;
+        private System.Windows.Forms.CheckBox cBMacroRepeat;
+        private System.Windows.Forms.ToolTip tp;
     }
 }

DS4Windows/DS4Forms/SpecActions.cs

@@ -61,6 +61,13 @@ namespace DS4Windows.Forms
             advColorDialog = new AdvancedColorDialog();
             advColorDialog.FullOpen = true;
             advColorDialog.OnUpdateColor += new AdvancedColorDialog.ColorUpdateHandler(this.advColorDialog_OnUpdateColor);
+
+            tp.SetToolTip(cBMacroScanCode, Properties.Resources.MacroScanCodeTip);
+            tp.SetToolTip(cBMacroRunOnRelease, Properties.Resources.MacroRunOnReleaseTip);
+            tp.SetToolTip(cBMacroRepeat, Properties.Resources.MacroRepeatTip);
+            tp.SetToolTip(cBMacroSyncRun, Properties.Resources.MacroSynchronizedRunTip);
+            tp.SetToolTip(cBMacroKeepKeyState, Properties.Resources.MacroKeepKeyStateTip);
+
         }
 
         void LoadAction()
@@ -81,6 +88,10 @@ namespace DS4Windows.Forms
                     macrostag = act.macro; 
                     lbMacroRecorded.Text = "Macro Recored";
                     cBMacroScanCode.Checked = act.keyType.HasFlag(DS4KeyType.ScanCode);
+                    cBMacroRunOnRelease.Checked = act.pressRelease;
+                    cBMacroSyncRun.Checked = act.synchronized;
+                    cBMacroKeepKeyState.Checked = act.keepKeyState;
+                    cBMacroRepeat.Checked = act.keyType.HasFlag(DS4KeyType.RepeatMacro);
                     break;
                 case "Program": 
                     cBActions.SelectedIndex = 2; 
@@ -251,7 +262,13 @@ namespace DS4Windows.Forms
                             actRe = true;
                             if (!string.IsNullOrEmpty(oldprofilename) && oldprofilename != tBName.Text)
                                 Global.RemoveAction(oldprofilename);
-                            Global.SaveAction(tBName.Text, String.Join("/", controls), cBActions.SelectedIndex, String.Join("/", macrostag), edit, (cBMacroScanCode.Checked ? "Scan Code" : ""));
+                            Global.SaveAction(tBName.Text, String.Join("/", controls), cBActions.SelectedIndex, String.Join("/", macrostag), edit, String.Join("/", new string[] {
+                                  (cBMacroScanCode.Checked ? "Scan Code" : null),
+                                  (cBMacroRunOnRelease.Checked ? "RunOnRelease" : null),
+                                  (cBMacroSyncRun.Checked ? "Sync" : null),
+                                  (cBMacroKeepKeyState.Checked ? "KeepKeyState" : null),
+                                  (cBMacroRepeat.Checked ? "Repeat" : null) }.Where(s => !String.IsNullOrEmpty(s))
+                                  ));
                         }
                         break;
                     case 2:

DS4Windows/DS4Forms/SpecActions.fi.resx

@@ -202,6 +202,21 @@
     <value>Kytke pois painamalla</value>
   </data>
   <data name="cbProfileAutoUntrigger.Text" xml:space="preserve">
-    <value>Poiskytkentä liipaisimen vapautuksella</value>
+    <value>Poiskytkentä painikkeen vapautuksella</value>
+  </data>
+  <data name="cBActions.Items8" xml:space="preserve">
+    <value>Sixaxis rattiohjainemuloinnin kalibrointi</value>
+  </data>
+  <data name="cBMacroKeepKeyState.Text" xml:space="preserve">
+    <value>Säilytä napin tila</value>
+  </data>
+  <data name="cBMacroRepeat.Text" xml:space="preserve">
+    <value>Toista painettaessa</value>
+  </data>
+  <data name="cBMacroRunOnRelease.Text" xml:space="preserve">
+    <value>Suorita painikkeen vapautuksella</value>
+  </data>
+  <data name="cBMacroSyncRun.Text" xml:space="preserve">
+    <value>Synkronoitu suoritus</value>
   </data>
 </root>

DS4Windows/DS4Forms/SpecActions.resx

@@ -814,7 +814,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lVTrigger.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="btnRecordMacro.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -841,7 +841,7 @@
     <value>pnlMacro</value>
   </data>
   <data name="&gt;&gt;btnRecordMacro.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>5</value>
   </data>
   <data name="btnBrowse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -889,7 +889,7 @@
     <value>pnlProfile</value>
   </data>
   <data name="&gt;&gt;cBProfiles.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="btnSave.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -922,7 +922,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnSave.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -952,7 +952,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="lbName.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -982,7 +982,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lbName.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="tBName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -1006,7 +1006,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;tBName.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="cBActions.Items" xml:space="preserve">
     <value>-Select an Action-</value>
@@ -1054,7 +1054,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cBActions.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
@@ -1147,7 +1147,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnBorder.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="btnSetUTriggerProfile.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1174,7 +1174,7 @@
     <value>pnlProfile</value>
   </data>
   <data name="&gt;&gt;btnSetUTriggerProfile.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="lVUnloadTrigger.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
@@ -1870,7 +1870,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lVUnloadTrigger.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="tBArg.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 91</value>
@@ -2031,6 +2031,114 @@
   <data name="&gt;&gt;pnlProgram.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
+  <data name="cBMacroRepeat.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cBMacroRepeat.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 120</value>
+  </data>
+  <data name="cBMacroRepeat.Size" type="System.Drawing.Size, System.Drawing">
+    <value>111, 17</value>
+  </data>
+  <data name="cBMacroRepeat.TabIndex" type="System.Int32, mscorlib">
+    <value>21</value>
+  </data>
+  <data name="cBMacroRepeat.Text" xml:space="preserve">
+    <value>Repeat while held</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRepeat.Name" xml:space="preserve">
+    <value>cBMacroRepeat</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRepeat.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRepeat.Parent" xml:space="preserve">
+    <value>pnlMacro</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRepeat.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="cBMacroKeepKeyState.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cBMacroKeepKeyState.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 97</value>
+  </data>
+  <data name="cBMacroKeepKeyState.Size" type="System.Drawing.Size, System.Drawing">
+    <value>97, 17</value>
+  </data>
+  <data name="cBMacroKeepKeyState.TabIndex" type="System.Int32, mscorlib">
+    <value>20</value>
+  </data>
+  <data name="cBMacroKeepKeyState.Text" xml:space="preserve">
+    <value>Keep key state</value>
+  </data>
+  <data name="&gt;&gt;cBMacroKeepKeyState.Name" xml:space="preserve">
+    <value>cBMacroKeepKeyState</value>
+  </data>
+  <data name="&gt;&gt;cBMacroKeepKeyState.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cBMacroKeepKeyState.Parent" xml:space="preserve">
+    <value>pnlMacro</value>
+  </data>
+  <data name="&gt;&gt;cBMacroKeepKeyState.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="cBMacroSyncRun.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cBMacroSyncRun.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 74</value>
+  </data>
+  <data name="cBMacroSyncRun.Size" type="System.Drawing.Size, System.Drawing">
+    <value>108, 17</value>
+  </data>
+  <data name="cBMacroSyncRun.TabIndex" type="System.Int32, mscorlib">
+    <value>19</value>
+  </data>
+  <data name="cBMacroSyncRun.Text" xml:space="preserve">
+    <value>Synchronized run</value>
+  </data>
+  <data name="&gt;&gt;cBMacroSyncRun.Name" xml:space="preserve">
+    <value>cBMacroSyncRun</value>
+  </data>
+  <data name="&gt;&gt;cBMacroSyncRun.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cBMacroSyncRun.Parent" xml:space="preserve">
+    <value>pnlMacro</value>
+  </data>
+  <data name="&gt;&gt;cBMacroSyncRun.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="cBMacroRunOnRelease.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cBMacroRunOnRelease.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 51</value>
+  </data>
+  <data name="cBMacroRunOnRelease.Size" type="System.Drawing.Size, System.Drawing">
+    <value>130, 17</value>
+  </data>
+  <data name="cBMacroRunOnRelease.TabIndex" type="System.Int32, mscorlib">
+    <value>18</value>
+  </data>
+  <data name="cBMacroRunOnRelease.Text" xml:space="preserve">
+    <value>Run on trigger release</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRunOnRelease.Name" xml:space="preserve">
+    <value>cBMacroRunOnRelease</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRunOnRelease.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRunOnRelease.Parent" xml:space="preserve">
+    <value>pnlMacro</value>
+  </data>
+  <data name="&gt;&gt;cBMacroRunOnRelease.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <data name="cBMacroScanCode.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2038,7 +2146,7 @@
     <value>NoControl</value>
   </data>
   <data name="cBMacroScanCode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 30</value>
+    <value>4, 29</value>
   </data>
   <data name="cBMacroScanCode.Size" type="System.Drawing.Size, System.Drawing">
     <value>79, 17</value>
@@ -2059,13 +2167,13 @@
     <value>pnlMacro</value>
   </data>
   <data name="&gt;&gt;cBMacroScanCode.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>4</value>
   </data>
   <data name="lbMacroRecorded.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="lbMacroRecorded.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 50</value>
+    <value>0, 141</value>
   </data>
   <data name="lbMacroRecorded.Size" type="System.Drawing.Size, System.Drawing">
     <value>153, 23</value>
@@ -2086,13 +2194,13 @@
     <value>pnlMacro</value>
   </data>
   <data name="&gt;&gt;lbMacroRecorded.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>6</value>
   </data>
   <data name="pnlMacro.Location" type="System.Drawing.Point, System.Drawing">
     <value>206, 58</value>
   </data>
   <data name="pnlMacro.Size" type="System.Drawing.Size, System.Drawing">
-    <value>163, 94</value>
+    <value>163, 165</value>
   </data>
   <data name="pnlMacro.TabIndex" type="System.Int32, mscorlib">
     <value>261</value>
@@ -2110,66 +2218,6 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pnlMacro.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="lbUnloadTipProfile.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="lbUnloadTipProfile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 95</value>
-  </data>
-  <data name="lbUnloadTipProfile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
-  </data>
-  <data name="lbUnloadTipProfile.TabIndex" type="System.Int32, mscorlib">
-    <value>259</value>
-  </data>
-  <data name="&gt;&gt;lbUnloadTipProfile.Name" xml:space="preserve">
-    <value>lbUnloadTipProfile</value>
-  </data>
-  <data name="&gt;&gt;lbUnloadTipProfile.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lbUnloadTipProfile.Parent" xml:space="preserve">
-    <value>pnlProfile</value>
-  </data>
-  <data name="&gt;&gt;lbUnloadTipProfile.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="pnlProfile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>206, 58</value>
-  </data>
-  <data name="pnlProfile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>161, 121</value>
-  </data>
-  <data name="pnlProfile.TabIndex" type="System.Int32, mscorlib">
-    <value>262</value>
-  </data>
-  <data name="pnlProfile.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;pnlProfile.Name" xml:space="preserve">
-    <value>pnlProfile</value>
-  </data>
-  <data name="&gt;&gt;pnlProfile.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;pnlProfile.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;pnlProfile.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;cbProfileAutoUntrigger.Name" xml:space="preserve">
-    <value>cbProfileAutoUntrigger</value>
-  </data>
-  <data name="&gt;&gt;cbProfileAutoUntrigger.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cbProfileAutoUntrigger.Parent" xml:space="preserve">
-    <value>pnlProfile</value>
-  </data>
-  <data name="&gt;&gt;cbProfileAutoUntrigger.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <data name="cbProfileAutoUntrigger.AutoSize" type="System.Boolean, mscorlib">
@@ -2199,6 +2247,54 @@
   <data name="&gt;&gt;cbProfileAutoUntrigger.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="lbUnloadTipProfile.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="lbUnloadTipProfile.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 95</value>
+  </data>
+  <data name="lbUnloadTipProfile.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 23</value>
+  </data>
+  <data name="lbUnloadTipProfile.TabIndex" type="System.Int32, mscorlib">
+    <value>259</value>
+  </data>
+  <data name="&gt;&gt;lbUnloadTipProfile.Name" xml:space="preserve">
+    <value>lbUnloadTipProfile</value>
+  </data>
+  <data name="&gt;&gt;lbUnloadTipProfile.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lbUnloadTipProfile.Parent" xml:space="preserve">
+    <value>pnlProfile</value>
+  </data>
+  <data name="&gt;&gt;lbUnloadTipProfile.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="pnlProfile.Location" type="System.Drawing.Point, System.Drawing">
+    <value>206, 58</value>
+  </data>
+  <data name="pnlProfile.Size" type="System.Drawing.Size, System.Drawing">
+    <value>161, 121</value>
+  </data>
+  <data name="pnlProfile.TabIndex" type="System.Int32, mscorlib">
+    <value>262</value>
+  </data>
+  <data name="pnlProfile.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;pnlProfile.Name" xml:space="preserve">
+    <value>pnlProfile</value>
+  </data>
+  <data name="&gt;&gt;pnlProfile.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pnlProfile.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;pnlProfile.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
   <data name="nUDDCBT.Location" type="System.Drawing.Point, System.Drawing">
     <value>56, 3</value>
   </data>
@@ -2446,7 +2542,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pnlKeys.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="pBGraident.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -2941,8 +3037,11 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pnlGameDVR.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
+  <metadata name="tp.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>267, 17</value>
+  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -2979,6 +3078,12 @@
   <data name="&gt;&gt;cHUnloadTrigger.Type" xml:space="preserve">
     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;tp.Name" xml:space="preserve">
+    <value>tp</value>
+  </data>
+  <data name="&gt;&gt;tp.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>SpecActions</value>
   </data>

DS4Windows/Properties/Resources.Designer.cs

@@ -1280,6 +1280,15 @@ namespace DS4Windows.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Keep the last key state when macro execution is completed (ie. if a key is left in down state then it is not automatically reset back to default state).
+        /// </summary>
+        public static string MacroKeepKeyStateTip {
+            get {
+                return ResourceManager.GetString("MacroKeepKeyStateTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Macro Recorded.
         /// </summary>
@@ -1289,6 +1298,42 @@ namespace DS4Windows.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Repeat a macro while the trigger key is held down.
+        /// </summary>
+        public static string MacroRepeatTip {
+            get {
+                return ResourceManager.GetString("MacroRepeatTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Run a macro on the trigger key release.
+        /// </summary>
+        public static string MacroRunOnReleaseTip {
+            get {
+                return ResourceManager.GetString("MacroRunOnReleaseTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Use a scan code value of keyboard keys in a macro.
+        /// </summary>
+        public static string MacroScanCodeTip {
+            get {
+                return ResourceManager.GetString("MacroScanCodeTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Run multiple macros in synchronized order if the same trigger has several macros (key down macro completed before key release macro is run).
+        /// </summary>
+        public static string MacroSynchronizedRunTip {
+            get {
+                return ResourceManager.GetString("MacroSynchronizedRunTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Make a New Profile.
         /// </summary>

DS4Windows/Properties/Resources.fi.resx

@@ -615,4 +615,19 @@
   <data name="EnableTouchToggle" xml:space="preserve">
     <value>Salli kosketuslevyhiiriohjaimen päälle-pois kytkentä PS + kosketuslevynapautuksella.</value>
   </data>
+  <data name="MacroScanCodeTip" xml:space="preserve">
+    <value>Käytä scan code näppäinkoodeja makrossa</value>
+  </data>
+  <data name="MacroRunOnReleaseTip" xml:space="preserve">
+    <value>Suorita makro painikkeen vapautuksella</value>
+  </data>
+  <data name="MacroSynchronizedRunTip" xml:space="preserve">
+    <value>Suorita useampi makro synkronoidussa järjestyksessä (esim painikkeen aktivoinnin makro suoritetaan kokonaisuudessa ennen painikkeen vapautuksen makroa)</value>
+  </data>
+  <data name="MacroRepeatTip" xml:space="preserve">
+    <value>Toista makron suoritusta painikkeen painamisen ajan</value>
+  </data>
+  <data name="MacroKeepKeyStateTip" xml:space="preserve">
+    <value>Säilytä napin tilatieto kun makron suoritus on päättynyt (jos makro jättää napin Painettu-tilaan, niin makron suoritus ei automaattisesti palauta napin tilatietoa takaisin oletustilaan)</value>
+  </data>
 </root>

DS4Windows/Properties/Resources.resx

@@ -832,4 +832,19 @@
   <data name="ShowAutoProfileDebugLogTip" xml:space="preserve">
     <value>If enabled then Log tab page shows detailed messages of auto-profile events.</value>
   </data>
+  <data name="MacroScanCodeTip" xml:space="preserve">
+    <value>Use a scan code value of keyboard keys in a macro</value>
+  </data>
+  <data name="MacroRunOnReleaseTip" xml:space="preserve">
+    <value>Run a macro on the trigger key release</value>
+  </data>
+  <data name="MacroSynchronizedRunTip" xml:space="preserve">
+    <value>Run multiple macros in synchronized order if the same trigger has several macros (key down macro completed before key release macro is run)</value>
+  </data>
+  <data name="MacroRepeatTip" xml:space="preserve">
+    <value>Repeat a macro while the trigger key is held down</value>
+  </data>
+  <data name="MacroKeepKeyStateTip" xml:space="preserve">
+    <value>Keep the last key state when macro execution is completed (ie. if a key is left in down state then it is not automatically reset back to default state)</value>
+  </data>
 </root>