Controller Toggle tweaks

Author: seerge

app/Ally/AllyControl.cs

@@ -314,7 +314,7 @@ public void Init()
             if (AppConfig.IsAlly()) settings.VisualiseAlly(true);
             else return;
 
-            SetMode((ControllerMode)AppConfig.Get("controller_mode", (int)ControllerMode.Auto));
+            SetMode((ControllerMode)AppConfig.Get("controller_mode", (int)ControllerMode.Auto), true);
 
             settings.VisualiseBacklight(InputDispatcher.GetBacklight());
             settings.VisualiseFPSLimit(amdControl.GetFPSLimit());
@@ -477,7 +477,7 @@ static private void BindZone(BindingZone zone)
             DecodeBinding(KeyR1).CopyTo(bindings, 27);
             DecodeBinding(KeyR2).CopyTo(bindings, 38);
 
-            AsusHid.WriteInput(CommandReady, null);
+            //AsusHid.WriteInput(CommandReady, null);
             AsusHid.WriteInput(bindings, $"B{zone}");
 
 
@@ -491,7 +491,7 @@ static void WakeUp()
 
         static public void SetDeadzones()
         {
-            WakeUp();
+            //WakeUp();
 
             AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xd1, 4, 4,
                 (byte)AppConfig.Get("ls_min", 0),
@@ -519,7 +519,7 @@ public static void ApplyXBoxStatus()
             AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0B, 0x01, AppConfig.Is("controller_disabled") ? (byte)0x02 : (byte)0x01 }, "Status");
         }
 
-        public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto)
+        public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto, bool init = false)
         {
             Task.Run(() =>
             {
@@ -543,11 +543,14 @@ public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto)
 
                 if (applyMode != ControllerMode.Auto) _applyMode = applyMode;
 
-                InputDispatcher.SetBacklightAuto(true);
-                WakeUp();
+                if (init)
+                {
+                    WakeUp();
+                    InputDispatcher.SetBacklightAuto(true);
+                }
 
                 AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x01, 0x01, (byte)_applyMode }, "Controller");
-                AsusHid.WriteInput(CommandSave, null);
+                //AsusHid.WriteInput(CommandSave, null);
 
                 BindZone(BindingZone.M1M2);
 
@@ -561,18 +564,19 @@ public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto)
                 BindZone(BindingZone.Trigger);
 
                 AsusHid.WriteInput(CommandSave, null);
+
                 SetDeadzones();
 
             });
         }
 
-        private void SetMode(ControllerMode mode)
+        private void SetMode(ControllerMode mode, bool init = false)
         {
 
             _mode = mode;
             AppConfig.Set("controller_mode", (int)mode);
 
-            ApplyMode(mode);
+            ApplyMode(mode, init);
 
             if (mode == ControllerMode.Auto)
             {

app/Extra.cs

@@ -44,6 +44,11 @@ private void SetKeyCombo(ComboBox combo, TextBox txbox, string name)
                 customActions.Add("screenpad_up", Properties.Strings.ScreenPadUp);
             }
 
+            if (AppConfig.IsAlly())
+            {
+                customActions.Add("controller", "Controller Mode");
+            }
+
             switch (name)
             {
                 case "m1":

app/Input/InputDispatcher.cs

@@ -376,7 +376,7 @@ public void KeyPressed(object sender, KeyPressedEventArgs e)
                         Program.settingsForm.gpuControl.ToggleXGM(true);
                         break;
                     case Keys.F4:
-                        Program.settingsForm.allyControl.ToggleModeHotkey();
+                        Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
                         break;
                     case Keys.F14:
                         Program.settingsForm.gpuControl.SetGPUMode(AsusACPI.GPUModeEco);
@@ -520,6 +520,9 @@ public static void KeyProcess(string name = "m3")
                 case "calculator":
                     LaunchProcess("calc");
                     break;
+                case "controller":
+                    Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
+                    break;
                 default:
                     break;
             }

app/Program.cs

@@ -229,10 +229,15 @@ public static void SetAutoModes(bool powerChanged = false, bool init = false)
 
             BatteryControl.AutoBattery(init);
 
-            settingsForm.AutoKeyboard();
             settingsForm.matrixControl.SetMatrix(true);
 
-            allyControl.Init();
+            if (AppConfig.IsAlly())
+            {
+                allyControl.Init();
+            } else
+            {
+                settingsForm.AutoKeyboard();
+            }
         }
 
         private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)

app/USB/Aura.cs

@@ -250,7 +250,7 @@ public static byte[] AuraMessage(AuraMode mode, Color color, Color color2, int s
             msg[5] = mono ? (byte)0 : color.G; // G
             msg[6] = mono ? (byte)0 : color.B; // B
             msg[7] = (byte)speed; // aura.speed as u8;
-            msg[8] = 0xFF; // aura.direction as u8;
+            msg[8] = 0x00; // aura.direction as u8;
             msg[9] = mode == AuraMode.AuraBreathe ? (byte)1 : (byte)0;
             msg[10] = color2.R; // R
             msg[11] = mono ? (byte)0 : color2.G; // G
@@ -294,12 +294,12 @@ public static void ApplyBrightness(int brightness, string log = "Backlight", boo
                 if (delay) await Task.Delay(TimeSpan.FromSeconds(1));
                 if (isACPI) Program.acpi.TUFKeyboardBrightness(brightness);
 
-                AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, log);
+                AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
 
                 if (AppConfig.IsAlly()) ApplyAura();
 
                 if (AppConfig.ContainsModel("GA503"))
-                    AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, log);
+                    AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
             });