Restrict fan curve points

app/AppConfig.cs

@@ -413,7 +413,7 @@ public static class AppConfig
 
     public static bool IsDUO()
     {
-        return ContainsModel("Duo") || ContainsModel("GX550") || ContainsModel("GX650") || ContainsModel("UX840");
+        return ContainsModel("Duo") || ContainsModel("GX550") || ContainsModel("GX650");
     }
 
     // G14 2020 has no aura, but media keys instead
@@ -454,7 +454,7 @@ public static class AppConfig
 
     public static bool IsOLED()
     {
-        return ContainsModel("OLED") || IsSlash() || ContainsModel("M7600") || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150") || ContainsModel("M350") || ContainsModel("K650") || ContainsModel("UM53") || ContainsModel("K660") || ContainsModel("UX84") || ContainsModel("M650") || ContainsModel("M550") || ContainsModel("K340") || ContainsModel("K350") || ContainsModel("M140") || ContainsModel("UM340") || ContainsModel("S540") || ContainsModel("M7400") || ContainsModel("N650") || ContainsModel("HN7306") || ContainsModel("H7606") || ContainsModel("UX5406") || ContainsModel("M5606");
+        return ContainsModel("OLED") || IsSlash() || ContainsModel("M7600") || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150") || ContainsModel("M350") || ContainsModel("K650") || ContainsModel("UM53") || ContainsModel("K660") || ContainsModel("UX84") || ContainsModel("M650") || ContainsModel("M550") || ContainsModel("K340") || ContainsModel("K350") || ContainsModel("M140") || ContainsModel("UM340") || ContainsModel("S540") || ContainsModel("M7400") || ContainsModel("N650") || ContainsModel("HN7306") || ContainsModel("H7606") || ContainsModel("UX5406") || ContainsModel("UM5606");
     }
 
     public static bool IsNoOverdrive()
@@ -696,7 +696,7 @@ public static class AppConfig
 
     public static bool IsForceMiniled()
     {
-        return ContainsModel("G834JYR") || ContainsModel("G834JZR") || Is("force_miniled");
+        return ContainsModel("G834JYR") || Is("force_miniled");
     }
 
     public static bool SaveDimming()

app/AsusACPI.cs

@@ -583,7 +583,7 @@ public class AsusACPI
         }
 
         //Logger.WriteLine($"GetFan {device} :" + BitConverter.ToString(result));
-
+        if (IsInvalidCurve(result)) result = AppConfig.GetDefaultCurve(device);
         return result;
 
     }
@@ -598,43 +598,20 @@ public class AsusACPI
         return curve.All(singleByte => singleByte == 0);
     }
 
+    public static int FixTemp(int temp, int index)
+    {
+        var dxMin = 30 + 10 * index;
+        var dxMax = dxMin + 9;
+        return Math.Min(dxMax, Math.Max(dxMin, temp));
+    }
+
     public static byte[] FixFanCurve(byte[] curve)
     {
         if (curve.Length != 16) throw new Exception("Incorrect curve");
 
-        var points = new Dictionary<byte, byte>();
-        byte old = 0;
-
         for (int i = 0; i < 8; i++)
         {
-            if (curve[i] <= old) curve[i] = (byte)Math.Min(100, old + 6); // preventing 2 points in same spot from default asus profiles
-            points[curve[i]] = curve[i + 8];
-            old = curve[i];
-        }
-
-        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(30, 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++;
+            curve[i] = (byte)FixTemp(curve[i], i); 
         }
 
         return curve;

app/Display/ScreenControl.cs

@@ -6,14 +6,7 @@ namespace GHelper.Display
     {
 
         public const int MAX_REFRESH = 1000;
-        public static int MIN_RATE = AppConfig.Get("min_rate", 60);
-        public static int MAX_RATE = AppConfig.Get("max_rate");
 
-        public static int GetMaxRate(string? laptopScreen)
-        {
-            if (MAX_RATE > 0) return MAX_RATE;
-            else return ScreenNative.GetMaxRefreshRate(laptopScreen);
-        }
 
         public void AutoScreen(bool force = false)
         {
@@ -22,7 +15,7 @@ namespace GHelper.Display
                 if (SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online)
                     SetScreen(MAX_REFRESH, 1);
                 else
-                    SetScreen(MIN_RATE, 0);
+                    SetScreen(60, 0);
             }
             else
             {
@@ -36,7 +29,7 @@ namespace GHelper.Display
             var refreshRate = ScreenNative.GetRefreshRate(laptopScreen);
             if (refreshRate < 0) return;
 
-            ScreenNative.SetRefreshRate(laptopScreen, refreshRate > MIN_RATE ? MIN_RATE : GetMaxRate(laptopScreen));
+            ScreenNative.SetRefreshRate(laptopScreen, refreshRate > 60 ? 60 : ScreenNative.GetMaxRefreshRate(laptopScreen));
             InitScreen();
         }
 
@@ -50,7 +43,7 @@ namespace GHelper.Display
 
             if (frequency >= MAX_REFRESH)
             {
-                frequency = GetMaxRate(laptopScreen);
+                frequency = ScreenNative.GetMaxRefreshRate(laptopScreen);
             }
 
             if (frequency > 0 && frequency != refreshRate)
@@ -158,7 +151,7 @@ namespace GHelper.Display
         {
             var laptopScreen = ScreenNative.FindLaptopScreen();
             int frequency = ScreenNative.GetRefreshRate(laptopScreen);
-            int maxFrequency = GetMaxRate(laptopScreen);
+            int maxFrequency = ScreenNative.GetMaxRefreshRate(laptopScreen);
 
             if (maxFrequency > 0) AppConfig.Set("max_frequency", maxFrequency);
             else maxFrequency = AppConfig.Get("max_frequency");

app/Display/VisualControl.cs

@@ -1,5 +1,4 @@
 using GHelper.Helpers;
-using Microsoft.Win32;
 using System.Management;
 
 namespace GHelper.Display
@@ -38,7 +37,6 @@ namespace GHelper.Display
         Cinema = 25,
         Vivid = 13,
         Eyecare = 17,
-        Disabled = 18,
     }
     public static class VisualControl
     {
@@ -101,7 +99,7 @@ namespace GHelper.Display
                 foreach (FileInfo icm in icms)
                 {
                     //Logger.WriteLine(icm.FullName);
-
+                    
                     if (icm.Name.Contains("sRGB"))
                     {
                         try
@@ -109,7 +107,7 @@ namespace GHelper.Display
                             _modes.Add(isVivo ? SplendidGamut.VivoSRGB : SplendidGamut.sRGB, "Gamut: sRGB");
                             Logger.WriteLine(icm.FullName + " sRGB");
                         }
-                        catch
+                        catch 
                         {
                         }
                     }
@@ -177,8 +175,7 @@ namespace GHelper.Display
                 { SplendidCommand.FPS, "FPS"},
                 { SplendidCommand.Cinema, "Cinema"},
                 { SplendidCommand.Vivid, "Vivid" },
-                { SplendidCommand.Eyecare, "Eyecare"},
-                { SplendidCommand.Disabled, "Disabled"}
+                { SplendidCommand.Eyecare, "Eyecare"}
             };
         }
 
@@ -208,20 +205,6 @@ namespace GHelper.Display
             };
         }
 
-        const string GameVisualKey = @"HKEY_CURRENT_USER\Software\ASUS\ARMOURY CRATE Service\GameVisual";
-        const string GameVisualValue = "ActiveGVStatus";
-
-        public static bool IsEnabled()
-        {
-            var status = (int?)Registry.GetValue(GameVisualKey, GameVisualValue, 1);
-            return status > 0;
-        }
-
-        public static void SetRegStatus(int status = 1)
-        {
-            Registry.SetValue(GameVisualKey, GameVisualValue, status, RegistryValueKind.DWord);
-        }
-
         public static void SetGamut(int mode = -1)
         {
             if (skipGamut) return;
@@ -252,7 +235,7 @@ namespace GHelper.Display
         public static void SetVisual(SplendidCommand mode = SplendidCommand.Default, int whiteBalance = DefaultColorTemp, bool init = false)
         {
             if (mode == SplendidCommand.None) return;
-            if ((mode == SplendidCommand.Disabled || mode == SplendidCommand.Default || mode == SplendidCommand.VivoNormal) && init) return; // Skip default setting on init
+            if ((mode == SplendidCommand.Default || mode == SplendidCommand.VivoNormal) && init) return; // Skip default setting on init
 
             if (!forceVisual && ScreenCCD.GetHDRStatus(true)) return;
             if (!forceVisual && ScreenNative.GetRefreshRate(ScreenNative.FindLaptopScreen(true)) < 0) return;
@@ -262,16 +245,12 @@ namespace GHelper.Display
 
             if (whiteBalance != DefaultColorTemp && !init) ProcessHelper.RunAsAdmin();
 
-            int? balance = null;
-            int command = 0;
+            int? balance;
 
             switch (mode)
             {
-                case SplendidCommand.Disabled:
-                    command = 2;
-                    break;
                 case SplendidCommand.Eyecare:
-                    balance = 4;
+                    balance = 2;
                     break;
                 case SplendidCommand.VivoNormal:
                 case SplendidCommand.VivoVivid:
@@ -285,7 +264,7 @@ namespace GHelper.Display
                     break;
             }
 
-            int result = RunSplendid(mode, command, balance);
+            var result = RunSplendid(mode, 0, balance);
             if (result == 0) return;
             if (result == -1)
             {
@@ -342,11 +321,6 @@ namespace GHelper.Display
                 var result = ProcessHelper.RunCMD(splendid, (int)command + " " + param1 + " " + param2);
                 if (result.Contains("file not exist") || (result.Length == 0 && !isVivo)) return 1;
                 if (result.Contains("return code: -1")) return -1;
-                if (result.Contains("Visual is disabled"))
-                {
-                    SetRegStatus(1);
-                    return 1;
-                }
             }
 
             return 0;

app/Fans.cs

@@ -757,8 +757,8 @@ namespace GHelper
 
             chart.Titles[0].Text = title;
 
-            chart.ChartAreas[0].AxisX.Minimum = 10;
-            chart.ChartAreas[0].AxisX.Maximum = 100;
+            chart.ChartAreas[0].AxisX.Minimum = 20;
+            chart.ChartAreas[0].AxisX.Maximum = 110;
             chart.ChartAreas[0].AxisX.Interval = 10;
 
             chart.ChartAreas[0].AxisY.Minimum = 0;
@@ -1019,7 +1019,7 @@ namespace GHelper
             int chartCount = 2;
 
             // Middle / system fan check
-            if (!AsusACPI.IsEmptyCurve(Program.acpi.GetFanCurve(AsusFan.Mid)) || Program.acpi.GetFan(AsusFan.Mid) >= 0)
+            if (Program.acpi.GetFan(AsusFan.Mid) >= 0)
             {
                 AppConfig.Set("mid_fan", 1);
                 chartCount++;
@@ -1082,15 +1082,10 @@ namespace GHelper
             if (reset || AsusACPI.IsInvalidCurve(curve))
             {
                 curve = Program.acpi.GetFanCurve(device, Modes.GetCurrentBase());
-
-                if (AsusACPI.IsInvalidCurve(curve))
-                    curve = AppConfig.GetDefaultCurve(device);
-
-                curve = AsusACPI.FixFanCurve(curve);
-
+                Logger.WriteLine($"Default {device}:" + BitConverter.ToString(curve));
             }
 
-            //Debug.WriteLine(BitConverter.ToString(curve));
+            curve = AsusACPI.FixFanCurve(curve);
 
             byte old = 0;
             for (int i = 0; i < 8; i++)
@@ -1245,8 +1240,7 @@ namespace GHelper
                     dx = ax.PixelPositionToValue(e.X);
                     dy = ay.PixelPositionToValue(e.Y);
 
-                    if (dx < 20) dx = 20;
-                    if (dx > 100) dx = 100;
+                    dx = AsusACPI.FixTemp((int)dx, curIndex);
 
                     if (dy < 0) dy = 0;
                     if (dy > fansMax) dy = fansMax;

app/GHelper.csproj

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

app/HardwareControl.cs

@@ -24,7 +24,7 @@ public static class HardwareControl
     public static decimal? fullCapacity;
     public static decimal? chargeCapacity;
 
-    public static string? batteryCharge;
+
 
     public static string? cpuFan;
     public static string? gpuFan;
@@ -34,20 +34,6 @@ public static class HardwareControl
 
     static long lastUpdate;
 
-    static bool _chargeWatt = AppConfig.Is("charge_watt");
-    public static bool chargeWatt
-    {
-        get
-        {
-            return _chargeWatt;
-        }
-        set
-        {
-            AppConfig.Set("charge_watt", value ? 1 : 0);
-            _chargeWatt = value;
-        }
-    }
-
     private static int GetGpuUse()
     {
         try
@@ -240,16 +226,8 @@ public static class HardwareControl
 
         if (fullCapacity > 0 && chargeCapacity > 0)
         {
-            batteryCapacity = Math.Min(100, (decimal)chargeCapacity / (decimal)fullCapacity * 100);
+            batteryCapacity = Math.Min(100, ((decimal)chargeCapacity / (decimal)fullCapacity) * 100);
             if (batteryCapacity > 99) BatteryControl.UnSetBatteryLimitFull();
-            if (chargeWatt)
-            {
-                batteryCharge = Math.Round((decimal)chargeCapacity / 1000, 1).ToString() + "Wh";
-            }
-            else
-            {
-                batteryCharge = Math.Round(batteryCapacity, 1) + "%";
-            }
         }
 
 

app/Helpers/Startup.cs

@@ -106,7 +106,7 @@ public class Startup
         {
 
             td.RegistrationInfo.Description = "G-Helper Auto Start";
-            td.Triggers.Add(new LogonTrigger { UserId = WindowsIdentity.GetCurrent().Name, Delay = TimeSpan.FromSeconds(2) });
+            td.Triggers.Add(new LogonTrigger { UserId = WindowsIdentity.GetCurrent().Name, Delay = TimeSpan.FromSeconds(1) });
             td.Actions.Add(strExeFilePath);
 
             if (ProcessHelper.IsUserAdministrator())

app/Input/InputDispatcher.cs

@@ -118,13 +118,6 @@ namespace GHelper.Input
 
             if (!AppConfig.Is("skip_hotkeys"))
             {
-
-                if (AppConfig.IsDUO())
-                {
-                    hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F7);
-                    hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F8);
-                }
-
                 hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F13);
 
                 hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F14);
@@ -136,6 +129,8 @@ namespace GHelper.Input
                 hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F19);
                 hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F20);
 
+
+
                 hook.RegisterHotKey(ModifierKeys.Control, Keys.VolumeDown);
                 hook.RegisterHotKey(ModifierKeys.Control, Keys.VolumeUp);
                 hook.RegisterHotKey(ModifierKeys.Shift, Keys.VolumeDown);
@@ -440,12 +435,6 @@ namespace GHelper.Input
                     case Keys.F4:
                         Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
                         break;
-                    case Keys.F7:
-                        SetScreenpad(-10);
-                        break;
-                    case Keys.F8:
-                        SetScreenpad(10);
-                        break;
                     case Keys.F13:
                         ToggleScreenRate();
                         break;
@@ -746,7 +735,6 @@ namespace GHelper.Input
                         KeyProcess("fne");
                         return;
                     case 174:   // FN+F5
-                    case 157:   // Zenbook DUO FN+F
                         modeControl.CyclePerformanceMode(Control.ModifierKeys == Keys.Shift);
                         return;
                     case 179:   // FN+F4

app/Input/KeyboardListener.cs

@@ -10,8 +10,6 @@ namespace GHelper.Input
         CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
         Action<int> _handler;
 
-        static int retry = 0;
-
         public KeyboardListener(Action<int> KeyHandler)
         {
             _handler = KeyHandler;
@@ -69,12 +67,6 @@ namespace GHelper.Input
             catch (Exception ex)
             {
                 Logger.WriteLine($"Listener exited: {ex.Message}");
-                if (retry++ < 2)
-                {
-                    Thread.Sleep(300);
-                    Logger.WriteLine($"Restarting listener {retry}");
-                    Listen();
-                }
             }
 
         }

app/Settings.cs

@@ -235,7 +235,6 @@ namespace GHelper
 
             labelCharge.MouseEnter += PanelBattery_MouseEnter;
             labelCharge.MouseLeave += PanelBattery_MouseLeave;
-            labelBattery.Click += LabelBattery_Click;
 
             buttonPeripheral1.Click += ButtonPeripheral_Click;
             buttonPeripheral2.Click += ButtonPeripheral_Click;
@@ -285,12 +284,6 @@ namespace GHelper
             InitVisual();
         }
 
-        private void LabelBattery_Click(object? sender, EventArgs e)
-        {
-            HardwareControl.chargeWatt = !HardwareControl.chargeWatt;
-            RefreshSensors(true);
-        }
-
         private void ButtonDonate_Click(object? sender, EventArgs e)
         {
             AppConfig.Set("donate_click", 1);
@@ -850,7 +843,7 @@ namespace GHelper
 
         private void Button60Hz_MouseHover(object? sender, EventArgs e)
         {
-            labelTipScreen.Text = Properties.Strings.MinRefreshTooltip.Replace("60", ScreenControl.MIN_RATE.ToString());
+            labelTipScreen.Text = Properties.Strings.MinRefreshTooltip;
         }
 
         private void ButtonScreen_MouseLeave(object? sender, EventArgs e)
@@ -860,7 +853,7 @@ namespace GHelper
 
         private void ButtonScreenAuto_MouseHover(object? sender, EventArgs e)
         {
-            labelTipScreen.Text = Properties.Strings.AutoRefreshTooltip.Replace("60", ScreenControl.MIN_RATE.ToString());
+            labelTipScreen.Text = Properties.Strings.AutoRefreshTooltip;
         }
 
         private void ButtonUltimate_MouseHover(object? sender, EventArgs e)
@@ -1215,7 +1208,7 @@ namespace GHelper
         private void Button60Hz_Click(object? sender, EventArgs e)
         {
             AppConfig.Set("screen_auto", 0);
-            screenControl.SetScreen(ScreenControl.MIN_RATE, 0);
+            screenControl.SetScreen(60, 0);
         }
 
 
@@ -1246,18 +1239,16 @@ namespace GHelper
             {
                 buttonScreenAuto.Activated = true;
             }
-            else if (frequency == ScreenControl.MIN_RATE)
+            else if (frequency == 60)
             {
                 button60Hz.Activated = true;
             }
-            else if (frequency > ScreenControl.MIN_RATE)
+            else if (frequency > 60)
             {
                 button120Hz.Activated = true;
             }
 
-            button60Hz.Text = ScreenControl.MIN_RATE + "Hz";
-
-            if (maxFrequency > ScreenControl.MIN_RATE)
+            if (maxFrequency > 60)
             {
                 button120Hz.Text = maxFrequency.ToString() + "Hz" + (overdriveSetting ? " + OD" : "");
                 panelScreen.Visible = true;
@@ -1429,9 +1420,7 @@ namespace GHelper
                 cpuTemp = ": " + Math.Round((decimal)HardwareControl.cpuTemp).ToString() + "°C";
 
             if (HardwareControl.batteryCapacity > 0)
-            {
-                charge = Properties.Strings.BatteryCharge + ": " + HardwareControl.batteryCharge;
-            }
+                charge = Properties.Strings.BatteryCharge + ": " + Math.Round(HardwareControl.batteryCapacity, 1) + "% ";
 
             if (HardwareControl.batteryRate < 0)
                 battery = Properties.Strings.Discharging + ": " + Math.Round(-(decimal)HardwareControl.batteryRate, 1).ToString() + "W";