Version 1.4.24

New Special Action: Check Battery life, choose to see the battery via a notification or via the lightbar with a gradient of your choice Sixaxis tilting added to special action triggers Added Special macros to be used by pressing the Load Presets button, selecting Cycle Programs allows you to hold the button to cycle through open programs, and edit the wait time to choose how long you hold the button down to go to the next program Can now add additional recordings between macros, click in the list where you want to add Can now delete actions in the macro by pressing delete Fixed color by battery being inverted Fixed bluetooth light being completely off when stopping/exiting DS4Windows Updated translation sheets (new items highlighted in 3rd column in green for easier finding)
gthieme · Feb 12, 2015 · b0edeb6 · b0edeb6
1 parent 0cb77ad
commit b0edeb6
Show file tree

Hide file tree

Showing 22 changed files with 9,878 additions and 2,828 deletions.
diff --git a/DS4Control/ControlSerivce.cs b/DS4Control/ControlSerivce.cs
@@ -13,7 +13,6 @@ public class ControlService
     {
         public X360Device x360Bus;
         public DS4Device[] DS4Controllers = new DS4Device[4];
-        //TPadModeSwitcher[] modeSwitcher = new TPadModeSwitcher[4];
         public Mouse[] touchPad = new Mouse[4];
         private bool running = false;
         private DS4State[] MappedState = new DS4State[4];
@@ -574,8 +573,7 @@ private void DoExtras(int ind)
             else if (held[ind])
             {
                 DS4LightBar.forcelight[ind] = false;
-                DS4LightBar.forcedFlash[ind] = 0;
-                //Console.WriteLine(p.Key + " is done");                
+                DS4LightBar.forcedFlash[ind] = 0;                
                 Global.ButtonMouseSensitivity[ind] = oldmouse[ind];
                 oldmouse[ind] = -1;
                 setRumble(0, 0, ind);

diff --git a/DS4Control/DS4LightBar.cs b/DS4Control/DS4LightBar.cs
@@ -142,7 +142,7 @@ public static void updateLightBar(DS4Device device, int deviceNum, DS4State cSta
             else
             {
                 if (device.ConnectionType == ConnectionType.BT)
-                    color = new DS4Color(0, 0, 0);
+                    color = new DS4Color(32, 64, 64);
                 else
                     color = new DS4Color(0, 0, 0);
             }

diff --git a/DS4Control/Log.cs b/DS4Control/Log.cs
@@ -18,11 +18,14 @@ public static void LogToGui(string data, bool warning)
             }
         }
 
-        public static void LogToTray(string data)
+        public static void LogToTray(string data, bool ignoreSettings = false)
         {
             if (TrayIconLog != null)
             {
-                TrayIconLog(null, new DebugEventArgs(data, false));
+                if (ignoreSettings)
+                    TrayIconLog(ignoreSettings, new DebugEventArgs(data, false));
+                else
+                    TrayIconLog(null, new DebugEventArgs(data, false));
             }
         }
     }

diff --git a/DS4Control/Mapping.cs b/DS4Control/Mapping.cs
diff --git a/DS4Control/ScpUtil.cs b/DS4Control/ScpUtil.cs
@@ -530,7 +530,7 @@ private static byte applyRatio(byte b1, byte b2, double r)
             else if (r < 0)
                 r = 0;
             r /= 100f;
-            return (byte)(b1 * r + b2 * (1 - r));
+            return (byte)Math.Round((b1 * (1 - r) + b2 *r),0);
         }
         public static DS4Color getTransitionedColor(DS4Color c1, DS4Color c2, double ratio)
         {//;
@@ -1846,6 +1846,10 @@ public bool SaveAction(string name, string controls, int mode, string details, b
                     el.AppendChild(m_Xdoc.CreateElement("Type")).InnerText = "DisconnectBT";
                     el.AppendChild(m_Xdoc.CreateElement("Details")).InnerText = details;
                     break;
+                case 6:
+                    el.AppendChild(m_Xdoc.CreateElement("Type")).InnerText = "BatteryCheck";
+                    el.AppendChild(m_Xdoc.CreateElement("Details")).InnerText = details;
+                    break;
             }
             if (edit)
             {
@@ -2031,6 +2035,11 @@ private DS4Controls getDS4ControlsByName(string key)
                 case "Swipe Down": return DS4Controls.SwipeDown;
                 case "Swipe Left": return DS4Controls.SwipeLeft;
                 case "Swipe Right": return DS4Controls.SwipeRight;
+
+                case "Tilt Up": return DS4Controls.GyroZNeg;
+                case "Tilt Down": return DS4Controls.GyroZPos;
+                case "Tilt Left": return DS4Controls.GyroXPos;
+                case "Tilt Right": return DS4Controls.GyroXNeg;
             }
             return 0;
         }

diff --git a/DS4Windows/DS4Form.cs b/DS4Windows/DS4Form.cs
@@ -517,9 +517,6 @@ private void CheckDrivers()
                     p.StartInfo.Verb = "runas";
                     try { p.Start(); }
                     catch { }
-                    //WelcomeDialog wd = new WelcomeDialog();
-                    //wd.ShowDialog();
-                    //wd.FormClosed += delegate { btnStartStop_Clicked(false); btnStartStop_Clicked(false); };
                 }
             }
             catch
@@ -670,7 +667,7 @@ protected void LogDebug(DateTime Time, String Data, bool warning)
 
         protected void ShowNotification(object sender, DebugEventArgs args)
         {
-            if (Form.ActiveForm != this && cBNotifications.Checked)
+            if (Form.ActiveForm != this && (cBNotifications.Checked || sender != null))
             {
                 this.notifyIcon1.BalloonTipText = args.Data;
                 notifyIcon1.BalloonTipTitle = "DS4Windows";