Cleanup

jkocon · Nov 6, 2024 · f72e3a6 · f72e3a6
1 parent 5570513
commit f72e3a6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 23 deletions.
diff --git a/app/Ally/AllyControl.cs b/app/Ally/AllyControl.cs
@@ -648,7 +648,7 @@ public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto, boo
                 if (init)
                 {
                     WakeUp();
-                    InputDispatcher.SetBacklightAuto(true);
+                    InputDispatcher.SetBacklightAuto();
                 }
 
                 AsusHid.WriteInput([AsusHid.INPUT_ID, 0xD1, 0x01, 0x01, (byte)_applyMode], "Controller");

diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs
@@ -873,11 +873,22 @@ public static int GetBacklight()
             return Math.Max(Math.Min(3, backlight), 0);
         }
 
-        public static void SetBacklightAuto(bool init = false)
+        public static void AutoKeyboard()
+        {
+            if (AppConfig.HasTabletMode()) TabletMode();
+            if (lidClose || AppConfig.Is("skip_aura")) return;
+
+            Aura.Init();
+            Aura.ApplyPower();
+            Aura.ApplyAura();
+            SetBacklightAuto();
+        }
+
+
+        public static void SetBacklightAuto()
         {
             if (lidClose) return;
-            if (init) Aura.Init();
-            Aura.ApplyBrightness(GetBacklight(), "Auto", init);
+            Aura.ApplyBrightness(GetBacklight(), "Auto");
         }
 
         public static void SetBacklight(int delta, bool force = false)

diff --git a/app/Program.cs b/app/Program.cs
@@ -6,6 +6,7 @@
 using GHelper.Input;
 using GHelper.Mode;
 using GHelper.Peripherals;
+using GHelper.USB;
 using Microsoft.Win32;
 using Ryzen;
 using System.Diagnostics;
@@ -258,9 +259,10 @@ public static bool SetAutoModes(bool powerChanged = false, bool init = false)
             }
             else
             {
-                settingsForm.AutoKeyboard();
+                InputDispatcher.AutoKeyboard();
             }
 
+            XGM.InitLight();
             VisualControl.InitBrightness();
 
             return true;

diff --git a/app/Settings.cs b/app/Settings.cs
@@ -1541,24 +1541,6 @@ public void SetModeLabel(string modeText)
         }
 
 
-        public void AutoKeyboard()
-        {
-
-            if (!AppConfig.Is("skip_aura"))
-            {
-                Aura.ApplyPower();
-                Aura.ApplyAura();
-            }
-
-            InputDispatcher.SetBacklightAuto(true);
-
-            if (Program.acpi.IsXGConnected())
-                XGM.Light(AppConfig.Is("xmg_light"));
-
-            if (AppConfig.HasTabletMode()) InputDispatcher.TabletMode();
-
-        }
-
 
         public void VisualizeXGM(int GPUMode = -1)
         {

diff --git a/app/USB/Aura.cs b/app/USB/Aura.cs
@@ -361,6 +361,11 @@ private static void ApplyAllyPower(AuraPower flags)
             AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x09, 0x01, power }, "Aura");
         }
 
+        public static void ApplyPowerOff()
+        {
+            AsusHid.Write(AuraPowerMessage(new AuraPower()));
+        }
+
         public static void ApplyPower()
         {
 

diff --git a/app/USB/XGM.cs b/app/USB/XGM.cs
@@ -52,6 +52,10 @@ public static void Light(bool status)
             Write(new byte[] { 0x5e, 0xc5, status ? (byte)0x50 : (byte)0 });
         }
 
+        public static void InitLight()
+        {
+            if (Program.acpi.IsXGConnected()) Light(AppConfig.Is("xmg_light"));
+        }
 
         public static void Reset()
         {