Aura tweaks

Supports AniMeMatrix for Zephyrus M16 2023 (GU604)

app/ASUSWmi.cs

@@ -1,4 +1,5 @@
-using GHelper;
+using System.Globalization;
+using System.IO.Pipes;
 using System.Management;
 using System.Runtime.InteropServices;
 
@@ -205,7 +206,7 @@ public class ASUSWmi
         byte[] args = new byte[8];
         BitConverter.GetBytes((uint)DeviceID).CopyTo(args, 0);
         byte[] status = CallMethod(DSTS, args);
-        
+
         return BitConverter.ToInt32(status, 0) - 65536;
 
     }
@@ -215,7 +216,7 @@ public class ASUSWmi
         byte[] args = new byte[8];
         BitConverter.GetBytes((uint)DeviceID).CopyTo(args, 0);
         BitConverter.GetBytes((uint)Status).CopyTo(args, 4);
-        
+
         return CallMethod(DSTS, args);
     }
 
@@ -243,9 +244,7 @@ public class ASUSWmi
         int result;
 
         for (int i = 8; i < curve.Length; i++)
-        {
             curve[i] = Math.Max((byte)0, Math.Min((byte)99, curve[i])); // it seems to be a bug, when some old model's bios can go nuts if fan is set to 100% 
-        }
 
         switch (device)
         {
@@ -287,6 +286,47 @@ public class ASUSWmi
 
     }
 
+
+    public static bool IsEmptyCurve(byte[] curve) {
+        return curve.Length != 16 || curve.All(singleByte => singleByte == 0);
+    }
+
+    public static byte[] FixFanCurve(byte[] curve)
+    {
+        if (curve.Length != 16) throw new Exception("Incorrect curve");
+
+        var points = new Dictionary<byte, byte>();
+        for (int i = 0; i < 8; i++) points[curve[i]] = curve[i+8];
+
+        var pointsFixed = new Dictionary<byte, byte>();
+        bool fix = false;
+
+        int count = 0;
+        foreach (var pair in points.OrderBy(x => x.Key))
+        {
+            if (count == 0 && pair.Key >= 40)
+            {
+                fix = true;
+                pointsFixed.Add(20, 0);
+            }
+
+            if (count != 3 || !fix) 
+                pointsFixed.Add(pair.Key, pair.Value);
+            count++;
+        }
+
+        count = 0;
+        foreach (var pair in pointsFixed.OrderBy(x => x.Key))
+        {
+            curve[count] =pair.Key;
+            curve[count+8] = pair.Value;
+            count++;
+        }
+
+        return curve;
+
+    }
+
     public void TUFKeyboardBrightness(int brightness)
     {
         int param = 0x80 | (brightness & 0x7F);
@@ -336,7 +376,8 @@ public class ASUSWmi
             watcher.Scope = new ManagementScope("root\\wmi");
             watcher.Query = new WqlEventQuery("SELECT * FROM AsusAtkWmiEvent");
             watcher.Start();
-        } catch
+        }
+        catch
         {
             Logger.WriteLine("Can't connect to ASUS WMI events");
         }

app/AnimeMatrix/AnimeMatrixDevice.cs

@@ -61,7 +61,8 @@ namespace Starlight.AnimeMatrix
     public enum AnimeType
     {
         GA401,
-        GA402
+        GA402,
+        GU604
     }
 
 
@@ -88,6 +89,8 @@ namespace Starlight.AnimeMatrix
         //public int FullEvenRows = -1;
 
         public int dx = 0;
+        //Shifts the whole frame to the left or right to align with the diagonal cut
+        public int frameShiftX = 0;
         public int MaxColumns = 34;
 
         private int frameIndex = 0;
@@ -112,6 +115,16 @@ namespace Starlight.AnimeMatrix
                 UpdatePageLength = 410;
             }
 
+            if (model.Contains("GU604"))
+            {
+                _model = AnimeType.GU604;
+
+                MaxColumns = 39;
+                MaxRows = 92;
+                LedCount = 1711;
+                frameShiftX = -5;
+                UpdatePageLength = 630;
+            }
 
             _displayBuffer = new byte[LedCount];
 
@@ -173,6 +186,9 @@ namespace Starlight.AnimeMatrix
                     {
                         return (y + 1) / 2 - 3;
                     }
+                case AnimeType.GU604:
+                    return (int)Math.Ceiling(Math.Max(0, y - 9) / 2F);
+
                 default:
                     return (int)Math.Ceiling(Math.Max(0, y - 11) / 2F);
             }
@@ -184,6 +200,8 @@ namespace Starlight.AnimeMatrix
             {
                 case AnimeType.GA401:
                     return 33;
+                case AnimeType.GU604:
+                    return 39;
                 default:
                     return 34;
             }
@@ -226,7 +244,7 @@ namespace Starlight.AnimeMatrix
             if (!IsRowInRange(y)) return;
 
             if (x >= FirstX(y) && x < Width(y))
-                SetLedLinear(RowToLinearAddress(y) - FirstX(y) + x + dx, value);
+                SetLedLinear(RowToLinearAddress(y) - FirstX(y) + x + dx + frameShiftX, value);
         }
 
         public void WakeUp()
@@ -327,7 +345,7 @@ namespace Starlight.AnimeMatrix
             int second = DateTime.Now.Second;
 
             if (CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains("H"))
-                PresentTextDiagonal(DateTime.Now.ToString("H" + ((second % 2 == 0) ? ":" : " ") + "mm"));
+                PresentTextDiagonal(DateTime.Now.ToString("   H" + ((second % 2 == 0) ? ":" : " ") + "mm"));
             else
                 PresentTextDiagonal(DateTime.Now.ToString("h" + ((second % 2 == 0) ? ":" : " ") + "mmtt"));
         }

app/Aura.cs

@@ -1,8 +1,6 @@
 using HidLibrary;
 using Microsoft.Win32;
-using OSD;
 using System.Diagnostics;
-using System.Windows.Forms;
 
 namespace GHelper
 {
@@ -163,11 +161,14 @@ namespace GHelper
             Color2 = Color.FromArgb(colorCode);
         }
 
-        private static IEnumerable<HidDevice> GetHidDevices(int[] deviceIds)
+
+        private static IEnumerable<HidDevice> GetHidDevices(int[] deviceIds, int minInput = 18)
         {
             HidDevice[] HidDeviceList = HidDevices.Enumerate(0x0b05, deviceIds).ToArray();
             foreach (HidDevice device in HidDeviceList)
-                if (device.IsConnected && device.Description.ToLower().Contains("hid") && device.Capabilities.FeatureReportByteLength >= 64)
+                if (device.IsConnected 
+                    && device.Capabilities.FeatureReportByteLength > 0
+                    && device.Capabilities.InputReportByteLength >= minInput) // 
                     yield return device;
         }
 
@@ -196,12 +197,13 @@ namespace GHelper
             byte[] msg = { 0x5d, 0xba, 0xc5, 0xc4, (byte)brightness };
 
             var devices = GetHidDevices(deviceIds);
-            if (devices.Count() > 0) Logger.WriteLine("USB-KB = " + BitConverter.ToString(msg));
+            //Logger.WriteLine("USB-KB = " + BitConverter.ToString(msg));
 
             foreach (HidDevice device in devices)
             {
                 device.OpenDevice();
                 device.Write(msg);
+                Logger.WriteLine("USB-KB " + device.Attributes.ProductHexId + ":" + BitConverter.ToString(msg));
                 device.CloseDevice();
             }
 
@@ -217,27 +219,28 @@ namespace GHelper
 
 
             var devices = GetHidDevices(deviceIds);
-            if (devices.Count() > 0) Logger.WriteLine("USB-KB = " + BitConverter.ToString(msg));
+            //Logger.WriteLine("USB-KB = " + BitConverter.ToString(msg));
 
             foreach (HidDevice device in devices)
             {
                 device.OpenDevice();
                 device.Write(msg);
+                Logger.WriteLine("USB-KB " + device.Attributes.ProductHexId + ":" + BitConverter.ToString(msg));
                 device.CloseDevice();
             }
 
             if (Program.config.ContainsModel("TUF"))
                 Program.wmi.TUFKeyboardPower(
-                    flags.Contains(AuraDev19b6.AwakeKeyb), 
-                    flags.Contains(AuraDev19b6.BootKeyb), 
-                    flags.Contains(AuraDev19b6.SleepKeyb), 
+                    flags.Contains(AuraDev19b6.AwakeKeyb),
+                    flags.Contains(AuraDev19b6.BootKeyb),
+                    flags.Contains(AuraDev19b6.SleepKeyb),
                     flags.Contains(AuraDev19b6.ShutdownKeyb));
 
         }
 
         public static void ApplyXGMLight(bool status)
         {
-            byte value = status? (byte)0x50:(byte)0;
+            byte value = status ? (byte)0x50 : (byte)0;
             var msg = new byte[] { 0x5e, 0xc5, value };
 
             foreach (HidDevice device in GetHidDevices(new int[] { 0x1970 }))
@@ -273,7 +276,11 @@ namespace GHelper
             byte[] msg = AuraMessage(Mode, Color1, Color2, _speed);
 
             var devices = GetHidDevices(deviceIds);
-            if (devices.Count() > 0) Logger.WriteLine("USB-KB = " + BitConverter.ToString(msg));
+            if (devices.Count() == 0)
+            {
+                Logger.WriteLine("USB-KB : not found");
+                GetHidDevices(deviceIds, 0);
+            }
 
             foreach (HidDevice device in devices)
             {
@@ -282,6 +289,7 @@ namespace GHelper
                 device.Write(MESSAGE_SET);
                 device.Write(MESSAGE_APPLY);
                 device.CloseDevice();
+                Logger.WriteLine("USB-KB " + device.Capabilities.FeatureReportByteLength + "|" + device.Capabilities.InputReportByteLength + device.Description + device.DevicePath + ":" + BitConverter.ToString(msg));
             }
 
             if (Program.config.ContainsModel("TUF"))
@@ -299,7 +307,8 @@ namespace GHelper
                     myKey.SetValue("TurnOffKeybdLight", value, RegistryValueKind.DWord);
                     myKey.Close();
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 Logger.WriteLine(ex.Message);
             }

app/Fans.cs

@@ -15,6 +15,8 @@ namespace GHelper
 
         static int MinRPM, MaxRPM;
 
+        const int fansMax = 100;
+
         NvidiaGpuControl? nvControl = null;
 
         public Fans()
@@ -146,15 +148,23 @@ namespace GHelper
 
                 if (gpu_boost < 0) gpu_boost = ASUSWmi.MaxGPUBoost;
                 if (gpu_temp < 0) gpu_temp = ASUSWmi.MaxGPUTemp;
+                
                 if (core == -1) core = 0;
-                if (memory == 1) memory = 0;
+                if (memory == -1) memory = 0;
 
-                if (readClocks)
+                //if (readClocks)
+                //{
+                int status = nvControl.GetClocks(out int current_core, out int current_memory);
+                if (status != -1)
                 {
-                    nvControl.GetClocks(out core, out memory, out string gpuTitle);
-                    labelGPU.Text = gpuTitle;
+                    core = current_core;
+                    memory = current_memory;
                 }
 
+                labelGPU.Text = nvControl.FullName;
+
+                //}
+
                 trackGPUCore.Value = Math.Max(Math.Min(core, NvidiaGpuControl.MaxCoreOffset), NvidiaGpuControl.MinCoreOffset);
                 trackGPUMemory.Value = Math.Max(Math.Min(memory, NvidiaGpuControl.MaxMemoryOffset), NvidiaGpuControl.MinMemoryOffset);
 
@@ -233,7 +243,7 @@ namespace GHelper
             chart.ChartAreas[0].AxisX.Interval = 10;
 
             chart.ChartAreas[0].AxisY.Minimum = 0;
-            chart.ChartAreas[0].AxisY.Maximum = 100;
+            chart.ChartAreas[0].AxisY.Maximum = fansMax;
 
             chart.ChartAreas[0].AxisY.LabelStyle.Font = new Font("Arial", 7F);
 
@@ -242,10 +252,10 @@ namespace GHelper
             chart.ChartAreas[0].AxisX.LineColor = chartGrid;
             chart.ChartAreas[0].AxisY.LineColor = chartGrid;
 
-            for (int i = 0; i <= 90; i += 10)
+            for (int i = 0; i <= fansMax-10; i += 10)
                 chart.ChartAreas[0].AxisY.CustomLabels.Add(i - 2, i + 2, ChartPercToRPM(i));
 
-            chart.ChartAreas[0].AxisY.CustomLabels.Add(98, 102, Properties.Strings.RPM);
+            chart.ChartAreas[0].AxisY.CustomLabels.Add(fansMax-2, fansMax+2, Properties.Strings.RPM);
 
             chart.ChartAreas[0].AxisY.Interval = 10;
 
@@ -452,11 +462,16 @@ namespace GHelper
             int mode = Program.config.getConfig("performance_mode");
             byte[] curve = Program.config.getFanConfig(device);
 
-            if (def == 1 || curve.Length != 16)
+            if (def == 1 || ASUSWmi.IsEmptyCurve(curve))
+            {
                 curve = Program.wmi.GetFanCurve(device, mode);
+                
+                if (ASUSWmi.IsEmptyCurve(curve)) 
+                    curve = Program.config.getDefaultCurve(device);
 
-            if (curve.Length != 16 || curve.All(singleByte => singleByte == 0))
-                curve = Program.config.getDefaultCurve(device);
+                curve = ASUSWmi.FixFanCurve(curve);
+
+            }
 
             //Debug.WriteLine(BitConverter.ToString(curve));
 
@@ -569,7 +584,7 @@ namespace GHelper
                     if (dx > 100) dx = 100;
 
                     if (dy < 0) dy = 0;
-                    if (dy > 100) dy = 100;
+                    if (dy > fansMax) dy = fansMax;
 
                     dymin = (dx - 65) * 1.2;
 

app/GHelper.csproj

@@ -16,7 +16,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.60</AssemblyVersion>
+    <AssemblyVersion>0.62</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

app/Gpu/NvidiaGpuControl.cs

@@ -31,6 +31,8 @@ public class NvidiaGpuControl : IGpuControl
 
     public bool IsNvidia => IsValid;
 
+    public string FullName => _internalGpu!.FullName;
+
     public int? GetCurrentTemperature()
     {
         if (!IsValid)
@@ -49,12 +51,10 @@ public class NvidiaGpuControl : IGpuControl
     }
 
 
-    public int GetClocks(out int core, out int memory, out string gpu)
+    public int GetClocks(out int core, out int memory)
     {
         PhysicalGPU internalGpu = _internalGpu!;
 
-        gpu = internalGpu.FullName;
-
         //Logger.WriteLine(internalGpu.FullName);
         //Logger.WriteLine(internalGpu.ArchitectInformation.ToString());
 
@@ -63,12 +63,12 @@ public class NvidiaGpuControl : IGpuControl
             IPerformanceStates20Info states = GPUApi.GetPerformanceStates20(internalGpu.Handle);
             core = states.Clocks[PerformanceStateId.P0_3DPerformance][0].FrequencyDeltaInkHz.DeltaValue / 1000;
             memory = states.Clocks[PerformanceStateId.P0_3DPerformance][1].FrequencyDeltaInkHz.DeltaValue / 1000;
-            Logger.WriteLine($"GET GPU Clock offsets : {core}, {memory}");
+            Logger.WriteLine($"GET GPU CLOCKS: {core}, {memory}");
             return 0;
 
         } catch (Exception ex)
         {
-            Logger.WriteLine(ex.Message);
+            Logger.WriteLine("GET GPU CLOCKS:" + ex.Message);
             core = memory = 0; 
             return -1;
         }
@@ -90,7 +90,7 @@ public class NvidiaGpuControl : IGpuControl
     }
 
 
-    public bool RestartGPU()
+    public bool RestartGPUPnP()
     {
 
         if (!IsValid) return false;
@@ -99,13 +99,30 @@ public class NvidiaGpuControl : IGpuControl
         {
             PhysicalGPU internalGpu = _internalGpu!;
             var pnpDeviceId = internalGpu.BusInformation.PCIIdentifiers.ToString();
-            Logger.WriteLine("Device ID:"+ pnpDeviceId);
+            Logger.WriteLine("Device ID:" + pnpDeviceId);
             RunCMD("pnputil", $"/disable-device /deviceid \"{pnpDeviceId}\"");
             Thread.Sleep(3000);
             RunCMD("pnputil", $"/enable-device /deviceid \"{pnpDeviceId}\"");
             Thread.Sleep(2000);
             return true;
         }
+        catch (Exception ex)
+        {
+            Logger.WriteLine(ex.ToString());
+            return false;
+        }
+    }
+
+    public bool RestartGPU()
+    {
+        try
+        {
+            string script = @"$device = Get-PnpDevice | Where-Object { $_.FriendlyName -imatch 'NVIDIA' -and $_.Class -eq 'Display' }; Disable-PnpDevice $device.InstanceId -Confirm:$false; Start-Sleep -Seconds 3; Enable-PnpDevice $device.InstanceId -Confirm:$false";
+            Logger.WriteLine(script);
+            RunCMD("powershell", script);
+            //Thread.Sleep(2000);
+            return true;
+        }
         catch (Exception ex )
         {
             Logger.WriteLine(ex.ToString());
@@ -141,12 +158,12 @@ public class NvidiaGpuControl : IGpuControl
 
         try
         {
-            Logger.WriteLine($"SET GPU Clock : {core}, {memory}");
+            Logger.WriteLine($"SET GPU CLOCKS: {core}, {memory}");
             GPUApi.SetPerformanceStates20(internalGpu.Handle, overclock);
         }
         catch (Exception ex)
         {
-            Logger.WriteLine(ex.Message);
+            Logger.WriteLine("SET GPU CLOCKS: "+ex.Message);
             return -1;
         }
 

app/HardwareControl.cs

@@ -115,10 +115,14 @@ public static class HardwareControl
 
     public static bool IsUsedGPU(int threshold = 20)
     {
-        if (GetGpuUse() > threshold)
+        int use = GetGpuUse();
+        Logger.WriteLine("GPU usage: " + use);
+        if (use > threshold)
         {
             Thread.Sleep(1000);
-            return (GetGpuUse() > threshold);
+            use = GetGpuUse();
+            Logger.WriteLine("GPU usage: " + use);
+            return (use > threshold);
         }
         return false;
     }

app/NativeMethods.cs

@@ -647,6 +647,8 @@ public class NativeMethods
                 //Logger.WriteLine(screen.DeviceName);
                 count++;
             }
+
+            if (displayNum > 0 && count == 0) laptopScreen = defaultDevice;
         }
         catch (Exception ex)
         {

app/OptimizationService.cs

@@ -0,0 +1,38 @@
+using System.Text.RegularExpressions;
+using System.Text;
+
+namespace GHelper
+{
+    public static class OptimizationService
+    {
+        public static void SetChargeLimit (int newValue)
+        {
+            // Set the path to the .ini file
+            string path = @"C:\ProgramData\ASUS\ASUS System Control Interface\ASUSOptimization\Customization.ini";
+
+
+            // Make a backup copy of the INI file
+            string backupPath = path + ".bak";
+            File.Copy(path, backupPath, true);
+
+            string fileContents = File.ReadAllText(path, Encoding.Unicode);
+
+            // Find the section [BatteryHealthCharging]
+            string sectionPattern = @"\[BatteryHealthCharging\]\s*(version=\d+)?\s+value=(\d+)";
+            Match sectionMatch = Regex.Match(fileContents, sectionPattern);
+            if (sectionMatch.Success)
+            {
+                // Replace the value with the new value
+                string oldValueString = sectionMatch.Groups[2].Value;
+                int oldValue = int.Parse(oldValueString);
+                string newSection = sectionMatch.Value.Replace($"value={oldValue}", $"value={newValue}");
+
+                // Replace the section in the file contents
+                fileContents = fileContents.Replace(sectionMatch.Value, newSection);
+
+                File.WriteAllText(path, fileContents, Encoding.Unicode);
+            }
+        }
+    }
+
+}

app/Program.cs

@@ -291,16 +291,19 @@ namespace GHelper
             {
                 settingsForm.Show();
                 settingsForm.Activate();
+                settingsForm.VisualiseGPUMode();
 
-                if (action == "gpu")
+                switch (action)
                 {
-                    Startup.ReScheduleAdmin();
-                    settingsForm.FansToggle();
+                    case "gpu":
+                        Startup.ReScheduleAdmin();
+                        settingsForm.FansToggle();
+                        break;
+                    case "gpurestart":
+                        settingsForm.RestartGPU(false);
+                        break;
                 }
             }
-
-            settingsForm.VisualiseGPUMode();
-
         }
 
         static void TrayIcon_MouseClick(object? sender, MouseEventArgs e)

app/Properties/Strings.Designer.cs

@@ -825,6 +825,15 @@ namespace GHelper.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Something is using dGPU and preventing Eco mode. Restart dGPU in device manager? * Please proceed on your own risk..
+        /// </summary>
+        internal static string RestartGPU {
+            get {
+                return ResourceManager.GetString("RestartGPU", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to RPM.
         /// </summary>

app/Properties/Strings.resx

@@ -372,6 +372,9 @@
   <data name="Quit" xml:space="preserve">
     <value>Quit</value>
   </data>
+  <data name="RestartGPU" xml:space="preserve">
+    <value>Something is using dGPU and preventing Eco mode. Restart dGPU in device manager? * Please proceed on your own risk.</value>
+  </data>
   <data name="RPM" xml:space="preserve">
     <value>RPM</value>
   </data>

app/Settings.cs

@@ -1,14 +1,11 @@
 using CustomControls;
 using GHelper.Gpu;
 using Starlight.AnimeMatrix;
-using System;
 using System.Diagnostics;
 using System.Drawing.Imaging;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Timers;
-using System.Windows.Forms;
 using Tools;
 
 namespace GHelper
@@ -142,7 +139,7 @@ namespace GHelper
             int trim = model.LastIndexOf("_");
             if (trim > 0) model = model.Substring(0, trim);
 
-            labelModel.Text = model+(Program.IsUserAdministrator()?".":"");
+            labelModel.Text = model + (Program.IsUserAdministrator() ? "." : "");
 
             TopMost = Program.config.getConfig("topmost") == 1;
 
@@ -161,7 +158,7 @@ namespace GHelper
 
             contextMenuStrip.Items.Clear();
 
-            Padding padding = new Padding(5, 5, 5, 5);
+            Padding padding = new Padding(15,5,5,5);
 
             /*
             TableLayoutPanel[] tables = { tablePerf, tableGPU };
@@ -248,7 +245,7 @@ namespace GHelper
             quit.Margin = padding;
             contextMenuStrip.Items.Add(quit);
 
-            contextMenuStrip.ShowCheckMargin = true;
+            //contextMenuStrip.ShowCheckMargin = true;
             contextMenuStrip.RenderMode = ToolStripRenderMode.System;
 
             if (CheckSystemDarkModeStatus())
@@ -1056,17 +1053,18 @@ namespace GHelper
 
             //if ((gpu_core > -5 && gpu_core < 5) && (gpu_memory > -5 && gpu_memory < 5)) launchAsAdmin = false;
 
+            if (Program.wmi.DeviceGet(ASUSWmi.GPUEco) == 1) return;
             if (HardwareControl.GpuControl is null) return;
             if (!HardwareControl.GpuControl!.IsNvidia) return;
-            if (Program.wmi.DeviceGet(ASUSWmi.GPUEco) == 1) return;
 
             using NvidiaGpuControl nvControl = (NvidiaGpuControl)HardwareControl.GpuControl;
             try
             {
-                int getStatus = nvControl.GetClocks(out int current_core, out int current_memory, out string gpuName);
-                if (getStatus == -1) return;
-                
-                if (Math.Abs(gpu_core - current_core) < 5 && Math.Abs(gpu_memory - current_memory) < 5) return;
+                int getStatus = nvControl.GetClocks(out int current_core, out int current_memory);
+                if (getStatus != -1)
+                {
+                    if (Math.Abs(gpu_core - current_core) < 5 && Math.Abs(gpu_memory - current_memory) < 5) return;
+                }
 
                 int setStatus = nvControl.SetClocks(gpu_core, gpu_memory);
                 if (launchAsAdmin && setStatus == -1) Program.RunAsAdmin("gpu");
@@ -1085,7 +1083,7 @@ namespace GHelper
             int gpu_temp = Program.config.getConfigPerf("gpu_temp");
 
 
-            if (gpu_boost < ASUSWmi.MinGPUBoost || gpu_boost > ASUSWmi.MaxGPUBoost ) return;
+            if (gpu_boost < ASUSWmi.MinGPUBoost || gpu_boost > ASUSWmi.MaxGPUBoost) return;
             if (gpu_temp < ASUSWmi.MinGPUTemp || gpu_temp > ASUSWmi.MaxGPUTemp) return;
 
             if (Program.wmi.DeviceGet(ASUSWmi.PPT_GPUC0) >= 0)
@@ -1311,9 +1309,10 @@ namespace GHelper
                     SetScreen(1000, 1);
                 else
                     SetScreen(60, 0);
-            } else
+            }
+            else
             {
-                SetScreen(overdrive : Program.config.getConfig("overdrive")); 
+                SetScreen(overdrive: Program.config.getConfig("overdrive"));
             }
 
 
@@ -1453,19 +1452,43 @@ namespace GHelper
 
         }
 
-        public bool RestartGPU()
+        public void RestartGPU(bool confirm = true)
         {
-            if (HardwareControl.GpuControl is null) return false;
-            if (!HardwareControl.GpuControl!.IsNvidia) return false;
+            if (HardwareControl.GpuControl is null) return;
+            if (!HardwareControl.GpuControl!.IsNvidia) return;
 
-            DialogResult dialogResult = MessageBox.Show("Something is using dGPU and blocking Eco mode. Restart dGPU in a device manager and try to set Eco again?", Properties.Strings.EcoMode, MessageBoxButtons.YesNo);
-            if (dialogResult == DialogResult.No) return false;
+            if (confirm)
+            {
+                DialogResult dialogResult = MessageBox.Show(Properties.Strings.RestartGPU, Properties.Strings.EcoMode, MessageBoxButtons.YesNo);
+                if (dialogResult == DialogResult.No) return;
+            }
 
-            Program.RunAsAdmin();
+            Program.RunAsAdmin("gpurestart");
 
-            Logger.WriteLine("Trying to restart GPU");
-            var nvControl = (NvidiaGpuControl)HardwareControl.GpuControl;
-            return nvControl.RestartGPU();
+            if (!Program.IsUserAdministrator()) return;
+
+            Logger.WriteLine("Trying to restart dGPU");
+
+            Task.Run(async () =>
+            {
+                Program.settingsForm.BeginInvoke(delegate
+                {
+                    labelTipGPU.Text = "Restarting GPU ...";
+                    ButtonEnabled(buttonOptimized, false);
+                    ButtonEnabled(buttonEco, false);
+                    ButtonEnabled(buttonStandard, false);
+                    ButtonEnabled(buttonUltimate, false);
+                });
+
+                var nvControl = (NvidiaGpuControl)HardwareControl.GpuControl;
+                bool status = nvControl.RestartGPU();
+
+                Program.settingsForm.BeginInvoke(delegate
+                {
+                    labelTipGPU.Text = status ? "GPU Restarted, you can try Eco mode again" : "Failed to restart GPU";
+                    InitGPUMode();
+                });
+            });
 
         }
 
@@ -1489,13 +1512,14 @@ namespace GHelper
                     string[] tokill = { "EADesktop", "RadeonSoftware" };
                     foreach (string kill in tokill)
                         foreach (var process in Process.GetProcessesByName(kill)) process.Kill();
-                } 
+                }
 
+                //if (eco == 1) status = 0; else
                 status = Program.wmi.SetGPUEco(eco);
 
                 if (status == 0 && eco == 1 && hardWay)
                 {
-                    if (RestartGPU()) Program.wmi.SetGPUEco(1);
+                    RestartGPU();
                 }
 
                 await Task.Delay(TimeSpan.FromMilliseconds(500));
@@ -1507,7 +1531,7 @@ namespace GHelper
 
                 if (eco == 0)
                 {
-                    await Task.Delay(TimeSpan.FromMilliseconds(1000));
+                    await Task.Delay(TimeSpan.FromMilliseconds(3000));
                     HardwareControl.RecreateGpuControl();
                     SetGPUClocks(false);
                 }
@@ -1668,6 +1692,14 @@ namespace GHelper
             sliderBattery.Value = limit;
 
             Program.wmi.DeviceSet(ASUSWmi.BatteryLimit, limit, "BatteryLimit");
+            try
+            {
+                OptimizationService.SetChargeLimit(limit);
+            } catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+            }
+
             Program.config.setConfig("charge_limit", limit);
 
         }