From b3636fd4476e5e967a3e3d11d6280ce9147c99bf Mon Sep 17 00:00:00 2001
From: seerge <serge@asus>
Date: Thu, 2 Mar 2023 21:05:02 +0100
Subject: [PATCH] Remember performance mode for plugged / battery

---
 Program.cs  | 23 +++++++++++------------
 Settings.cs | 22 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/Program.cs b/Program.cs
index e4665f5a..7cb37791 100644
--- a/Program.cs
+++ b/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();
         }
 
 
diff --git a/Settings.cs b/Settings.cs
index 6ab3a5f7..516e1432 100644
--- a/Settings.cs
+++ b/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();