From 5c613af9f2c5035de2d1a0d9dc89fdf9180b7953 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Sun, 6 Aug 2023 16:48:25 +0200
Subject: [PATCH] Cleanup

---
 app/AppConfig.cs          | 31 ++++++++++++++++++++++++++++++-
 app/Gpu/GPUModeControl.cs |  6 +-----
 app/Mode/ModeControl.cs   | 26 +++++---------------------
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index c8e8d756..c26e5c86 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -300,7 +300,7 @@ public static class AppConfig
 
     public static bool NoAuraColor()
     {
-        return  ContainsModel("GA401") || ContainsModel("X13");
+        return  ContainsModel("GA401") || ContainsModel("X13") || ContainsModel("GA503RM");
     }
 
     public static bool IsStrix()
@@ -322,4 +322,33 @@ public static class AppConfig
     {
         return ContainsModel("13QY");
     }
+
+    public static bool NoAutoUltimate()
+    {
+        return ContainsModel("G614") || ContainsModel("GU604");
+    }
+
+
+    public static bool IsManualModeRequired()
+    {
+        if (!IsMode("auto_apply_power"))
+            return false;
+
+        return
+            Is("manual_mode") ||
+            ContainsModel("GU604") ||
+            ContainsModel("G733");
+    }
+
+    public static bool IsFanRequired()
+    {
+        return ContainsModel("GA402X") || ContainsModel("G513");
+    }
+
+    public static bool IsPowerRequired()
+    {
+        return ContainsModel("FX507") || ContainsModel("FX517") || ContainsModel("FX707");
+    }
+
+
 }
diff --git a/app/Gpu/GPUModeControl.cs b/app/Gpu/GPUModeControl.cs
index bf437039..f764ddc0 100644
--- a/app/Gpu/GPUModeControl.cs
+++ b/app/Gpu/GPUModeControl.cs
@@ -49,10 +49,6 @@ namespace GHelper.Gpu
         }
 
 
-        bool NoAutoUltimate()
-        {
-            return AppConfig.ContainsModel("G614") || AppConfig.ContainsModel("M16");
-        }
 
         public void SetGPUMode(int GPUMode, int auto = 0)
         {
@@ -84,7 +80,7 @@ namespace GHelper.Gpu
                 DialogResult dialogResult = MessageBox.Show(Properties.Strings.AlertUltimateOn, Properties.Strings.AlertUltimateTitle, MessageBoxButtons.YesNo);
                 if (dialogResult == DialogResult.Yes)
                 {
-                    if (NoAutoUltimate())
+                    if (AppConfig.NoAutoUltimate())
                     {
                         Program.acpi.SetGPUEco(0);
                         Thread.Sleep(100);
diff --git a/app/Mode/ModeControl.cs b/app/Mode/ModeControl.cs
index f36ab57c..388dfe63 100644
--- a/app/Mode/ModeControl.cs
+++ b/app/Mode/ModeControl.cs
@@ -65,7 +65,7 @@ namespace GHelper.Mode
 
             Modes.SetCurrent(mode);
 
-            Program.acpi.DeviceSet(AsusACPI.PerformanceMode, IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode");
+            Program.acpi.DeviceSet(AsusACPI.PerformanceMode, AppConfig.IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode");
 
             if (AppConfig.Is("xgm_fan") && Program.acpi.IsXGConnected()) AsusUSB.ResetXGM();
 
@@ -143,7 +143,7 @@ namespace GHelper.Mode
                 }
 
                 // force set PPTs for missbehaving bios on FX507/517 series
-                if ((AppConfig.ContainsModel("FX507") || AppConfig.ContainsModel("FX517") || AppConfig.ContainsModel("FX707") || xgmFan) && !AppConfig.IsMode("auto_apply_power"))
+                if ((AppConfig.IsPowerRequired() || xgmFan) && !AppConfig.IsMode("auto_apply_power"))
                 {
                     Task.Run(async () =>
                     {
@@ -159,22 +159,6 @@ namespace GHelper.Mode
 
         }
 
-        private static bool IsManualModeRequired()
-        {
-            if (!AppConfig.IsMode("auto_apply_power"))
-                return false;
-
-            return
-                AppConfig.Is("manual_mode") ||
-                AppConfig.ContainsModel("GU604") ||
-                AppConfig.ContainsModel("G733");
-        }
-
-        private static bool IsFanRequired()
-        {
-            return AppConfig.ContainsModel("GA402X") || AppConfig.ContainsModel("G513");
-        }
-
         public void AutoPower(int delay = 0)
         {
 
@@ -184,17 +168,17 @@ namespace GHelper.Mode
             bool applyFans = AppConfig.IsMode("auto_apply");
             //bool applyGPU = true;
 
-            if (applyPower)
+            if (applyPower && !applyFans)
             {
                 // force fan curve for misbehaving bios PPTs on some models
-                if (!applyFans && IsFanRequired())
+                if (AppConfig.IsFanRequired())
                 {
                     delay = 500;
                     AutoFans(true);
                 }
 
                 // Fix for models that don't support PPT settings in all modes, setting a "manual" mode for them
-                if (IsManualModeRequired() && !applyFans)
+                if (AppConfig.IsManualModeRequired())
                 {
                     AutoFans(true);
                 }