Remember performance mode for plugged / battery

ASUSWmi.cs

@@ -25,12 +25,12 @@ public class ASUSWmi
     public const uint DevsCPUFanCurve = 0x00110024;
     public const uint DevsGPUFanCurve = 0x00110025;
 
-    public const int PPT_Total = 0x001200A0;
-    public const int PPT_Total1 = 0x001200A1;
-    public const int PPT_Total2 = 0x001200A2;
+    public const int PPT_TotalA0 = 0x001200A0;
+    public const int PPT_TotalA1 = 0x001200A1;
 
-    public const int PPT_CPU = 0x001200B0;
-    public const int PPT_CPU1 = 0x001200B1;
+    public const int PPT_CPUB0 = 0x001200B0;
+    public const int PPT_CPUB1 = 0x001200B1;
+    public const int PPT_CPUA2 = 0x001200A2;
 
     public const int PerformanceBalanced = 0;
     public const int PerformanceTurbo = 1;

Fans.cs

@@ -141,12 +141,11 @@ namespace GHelper
             Program.config.setConfig("limit_total", limit_total);
             Program.config.setConfig("limit_cpu", limit_cpu);
 
-            Program.wmi.DeviceSet(ASUSWmi.PPT_Total, limit_total);
-            Program.wmi.DeviceSet(ASUSWmi.PPT_Total1, limit_total);
-            Program.wmi.DeviceSet(ASUSWmi.PPT_Total2, limit_total);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA0, limit_total);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA1, limit_total);
 
-            Program.wmi.DeviceSet(ASUSWmi.PPT_CPU, limit_cpu);
-            //Program.wmi.DeviceSet(ASUSWmi.PPT_CPU1, limit_cpu);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_CPUB0, limit_cpu);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_CPUA2, limit_cpu);
 
             labelApplied.ForeColor = Color.Blue;
             labelApplied.Text = "Applied";

Program.cs

@@ -61,17 +61,11 @@ namespace GHelper
             settingsForm.InitBoost();
             settingsForm.InitAura();
 
-            settingsForm.SetPerformanceMode(config.getConfig("performance_mode"));
-            settingsForm.SetBatteryChargeLimit(config.getConfig("charge_limit"));
-
             settingsForm.VisualiseGPUAuto(config.getConfig("gpu_auto"));
             settingsForm.VisualiseScreenAuto(config.getConfig("screen_auto"));
-
             settingsForm.SetStartupCheck(Startup.IsScheduled());
 
-            bool isPlugged = (System.Windows.Forms.SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online);
-            settingsForm.AutoGPUMode(isPlugged ? 1 : 0);
-            settingsForm.AutoScreen(isPlugged ? 1 : 0);
+            SetAutoModes();
 
             SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
 
@@ -81,13 +75,18 @@ namespace GHelper
 
         }
 
+        private static void SetAutoModes()
+        {
+            PowerLineStatus isPlugged = SystemInformation.PowerStatus.PowerLineStatus;
+            settingsForm.AutoGPUMode(isPlugged);
+            settingsForm.AutoScreen(isPlugged);
+            settingsForm.AutoPerformance(isPlugged);
+            settingsForm.SetBatteryChargeLimit(config.getConfig("charge_limit"));
+        }
+
         private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
         {
-            bool isPlugged = (System.Windows.Forms.SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online);
-            settingsForm.AutoGPUMode(isPlugged ? 1 : 0);
-            settingsForm.AutoScreen(isPlugged ? 1 : 0);
-
-            settingsForm.SetBatteryChargeLimit(config.getConfig("charge_limit"));
+            SetAutoModes();
         }
 
 

Settings.cs

@@ -498,7 +498,9 @@ namespace GHelper
             }
 
 
+            Program.config.setConfig("performance_"+(int)SystemInformation.PowerStatus.PowerLineStatus, PerformanceMode);
             Program.config.setConfig("performance_mode", PerformanceMode);
+
             Program.wmi.DeviceSet(ASUSWmi.PerformanceMode, PerformanceMode);
 
             if (Program.config.getConfig("auto_apply_" + PerformanceMode) == 1)
@@ -533,12 +535,22 @@ namespace GHelper
             SetPerformanceMode(Program.config.getConfig("performance_mode") + 1, true);
         }
 
-        public void AutoScreen(int Plugged = 1)
+        public void AutoPerformance(PowerLineStatus Plugged = PowerLineStatus.Online)
+        {
+            int mode = Program.config.getConfig("performance_"+(int)Plugged);
+            if (mode != -1)
+                SetPerformanceMode(mode, true);
+            else 
+                SetPerformanceMode(Program.config.getConfig("performance_mode"));
+        }
+
+
+        public void AutoScreen(PowerLineStatus Plugged = PowerLineStatus.Online)
         {
             int ScreenAuto = Program.config.getConfig("screen_auto");
             if (ScreenAuto != 1) return;
 
-            if (Plugged == 1)
+            if (Plugged == PowerLineStatus.Online)
                 SetScreen(1000, 1);
             else
                 SetScreen(60, 0);
@@ -547,7 +559,7 @@ namespace GHelper
 
         }
 
-        public void AutoGPUMode(int Plugged = 1)
+        public void AutoGPUMode(PowerLineStatus Plugged = PowerLineStatus.Online)
         {
 
             int GpuAuto = Program.config.getConfig("gpu_auto");
@@ -561,12 +573,12 @@ namespace GHelper
                 return;
             else
             {
-                if (eco == 1 && Plugged == 1)  // Eco going Standard on plugged
+                if (eco == 1 && Plugged == PowerLineStatus.Online)  // Eco going Standard on plugged
                 {
                     Program.wmi.DeviceSet(ASUSWmi.GPUEco, 0);
                     InitGPUMode();
                 }
-                else if (eco == 0 && Plugged == 0)  // Standard going Eco on plugged
+                else if (eco == 0 && Plugged != PowerLineStatus.Online)  // Standard going Eco on plugged
                 {
                     Program.wmi.DeviceSet(ASUSWmi.GPUEco, 1);
                     InitGPUMode();
@@ -749,18 +761,12 @@ namespace GHelper
         public void SetBatteryChargeLimit(int limit = 100)
         {
 
-            if (limit < 50 || limit > 100) limit = 100;
+            if (limit < 40 || limit > 100) return;
 
             labelBatteryTitle.Text = "Battery Charge Limit: " + limit.ToString() + "%";
             trackBattery.Value = limit;
-            try
-            {
-                Program.wmi.DeviceSet(ASUSWmi.BatteryLimit, limit);
-            }
-            catch
-            {
-                Debug.WriteLine("Can't set battery charge limit");
-            }
+            Program.wmi.DeviceSet(ASUSWmi.BatteryLimit, limit);
+
             Program.config.setConfig("charge_limit", limit);
 
         }