Cleanup

seerge · Feb 12, 2024 · f326fa9 · f326fa9
1 parent ab44dbf
commit f326fa9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/app/AnimeMatrix/AniMatrixControl.cs b/app/AnimeMatrix/AniMatrixControl.cs
@@ -4,7 +4,6 @@
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Timers;
-using static GHelper.AnimeMatrix.BuiltInAnimation;
 
 namespace GHelper.AnimeMatrix
 {
@@ -36,7 +35,7 @@ public AniMatrixControl(SettingsForm settingsForm)
 
             try
             {
-                if (AppConfig.ContainsModel("GA403") || AppConfig.ContainsModel("GU605"))
+                if (AppConfig.IsSlash())
                     deviceSlash = new SlashDevice();
                 else
                     deviceMatrix = new AnimeMatrixDevice();
@@ -165,9 +164,9 @@ public void SetMatrix(bool wakeUp = false)
         private void SetBuiltIn(int running)
         {
             BuiltInAnimation animation = new BuiltInAnimation(
-                (Running)running,
-                Sleeping.Starfield,
-                Shutdown.SeeYa,
+                (BuiltInAnimation.Running)running,
+                BuiltInAnimation.Sleeping.Starfield,
+                BuiltInAnimation.Shutdown.SeeYa,
                 BuiltInAnimation.Startup.StaticEmergence
             );
             deviceMatrix.SetBuiltInAnimation(true, animation);

diff --git a/app/AnimeMatrix/SlashDevice.cs b/app/AnimeMatrix/SlashDevice.cs
@@ -1,5 +1,4 @@
 using GHelper.AnimeMatrix.Communication;
-using GHelper.Mode;
 using System.Text;
 
 namespace GHelper.AnimeMatrix
@@ -38,10 +37,10 @@ public class SlashDevice : Device
             { SlashMode.Bounce, "Bounce"},
             { SlashMode.Slash, "Slash"},
             { SlashMode.Loading, "Loading"},
-            
+
             { SlashMode.BitStream, "Bit Stream"},
             { SlashMode.Transmission, "Transmission"},
-            
+
             { SlashMode.Flow, "Flow"},
             { SlashMode.Flux, "Flux"},
             { SlashMode.Phantom, "Phantom"},
@@ -106,7 +105,8 @@ public void SetMode(SlashMode mode)
             try
             {
                 modeByte = modeCodes[mode];
-            } catch (Exception)
+            }
+            catch (Exception)
             {
                 modeByte = 0x00;
             }

diff --git a/app/AppConfig.cs b/app/AppConfig.cs
@@ -101,7 +101,7 @@ public static string GetModel()
             }
         }
 
-        if (_model.Contains("GA402")) _model = "ROG Zephyrus G14 GA403UI"; // Debug Purposes
+        //if (_model.Contains("GA402RK")) _model = "ROG Zephyrus G14 GA403UI"; // Debug Purposes
 
         return _model;
     }
@@ -379,9 +379,14 @@ public static bool IsSingleColor()
         return ContainsModel("GA401") || ContainsModel("FX517Z") || ContainsModel("FX516P") || ContainsModel("X13") || IsARCNM() || ContainsModel("GA502IU");
     }
 
+    public static bool IsSlash()
+    {
+        return ContainsModel("GA403") || ContainsModel("GU605");
+    }
+
     public static bool IsInputBacklight()
     {
-        return ContainsModel("GA503") || ContainsModel("GA403");
+        return ContainsModel("GA503") || IsSlash();
     }
 
     public static bool IsStrix()

diff --git a/app/USB/Aura.cs b/app/USB/Aura.cs
@@ -294,7 +294,10 @@ 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.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
+                if (AppConfig.IsInputBacklight()) 
+                    AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
+                else 
+                    AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
 
                 if (AppConfig.IsAlly()) ApplyAura();