Version bump

app/Ally/AllyControl.cs

@@ -616,9 +616,9 @@ namespace GHelper.Ally
 
         }
 
-        public static void ApplyXBoxStatus()
+        public static void DisableXBoxController(bool disabled)
         {
-            AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0B, 0x01, AppConfig.Is("controller_disabled") ? (byte)0x02 : (byte)0x01 }, "Status");
+            AsusHid.WriteInput([AsusHid.INPUT_ID, 0xD1, 0x0B, 0x01, disabled ? (byte)0x02 : (byte)0x01], $"ControllerDisabled: {disabled}");
         }
 
         public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto, bool init = false)
@@ -651,7 +651,7 @@ namespace GHelper.Ally
                     InputDispatcher.SetBacklightAuto(true);
                 }
 
-                AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x01, 0x01, (byte)_applyMode }, "Controller");
+                AsusHid.WriteInput([AsusHid.INPUT_ID, 0xD1, 0x01, 0x01, (byte)_applyMode], "Controller");
                 //AsusHid.WriteInput(CommandSave, null);
 
                 BindZone(BindingZone.M1M2);
@@ -668,6 +668,13 @@ namespace GHelper.Ally
 
                 SetDeadzones();
 
+                if (init && AppConfig.Is("controller_disabled"))
+                {
+                    Thread.Sleep(500);
+                    DisableXBoxController(false);
+                    DisableXBoxController(true);
+                }
+
             });
         }
 

app/AppConfig.cs

@@ -12,7 +12,7 @@ public static class AppConfig
     private static string? _bios;
 
     private static Dictionary<string, object> config = new Dictionary<string, object>();
-    private static System.Timers.Timer timer = new System.Timers.Timer(1000);
+    private static System.Timers.Timer timer = new System.Timers.Timer(2000);
 
     static AppConfig()
     {
@@ -92,7 +92,9 @@ public static class AppConfig
 
         Thread.Sleep(500);
 
-        if (File.ReadAllText(backup).Contains("}"))
+        var backupText = File.ReadAllText(backup);
+
+        if (backupText.Contains("{") && backupText.Contains("}"))
         {
             File.Copy(backup, configFile, true);
         }
@@ -219,6 +221,7 @@ public static class AppConfig
 
     private static void Write()
     {
+        timer.Stop();
         timer.Start();
     }
 
@@ -410,7 +413,7 @@ public static class AppConfig
 
     public static bool IsDUO()
     {
-        return ContainsModel("Duo") || ContainsModel("GX550") || ContainsModel("GX650");
+        return ContainsModel("Duo") || ContainsModel("GX550") || ContainsModel("GX650") || ContainsModel("UX840");
     }
 
     // G14 2020 has no aura, but media keys instead
@@ -451,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");
+        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");
     }
 
     public static bool IsNoOverdrive()
@@ -637,7 +640,7 @@ public static class AppConfig
 
     public static bool IsForceSetGPUMode()
     {
-        return Is("gpu_mode_force_set") || ContainsModel("503");
+        return Is("gpu_mode_force_set") || (ContainsModel("503") && IsNotFalse("gpu_mode_force_set"));
     }
 
     public static bool IsNoGPUModes()
@@ -693,7 +696,7 @@ public static class AppConfig
 
     public static bool IsForceMiniled()
     {
-        return ContainsModel("G834JYR") || Is("force_miniled");
+        return ContainsModel("G834JYR") || ContainsModel("G834JZR") || Is("force_miniled");
     }
 
     public static bool SaveDimming()

app/AsusACPI.cs

@@ -114,7 +114,7 @@ public class AsusACPI
     public const int APU_MEM = 0x000600C1;
 
     public const int TUF_KB_BRIGHTNESS = 0x00050021;
-    public const int VIVO_KB_BRIGHTNESS = 0x0005002F;
+    public const int KBD_BACKLIGHT_OOBE = 0x0005002F;
 
     public const int TUF_KB = 0x00100056;
     public const int TUF_KB2 = 0x0010005a;
@@ -788,7 +788,6 @@ public class AsusACPI
     {
         int param = 0x80 | (brightness & 0x7F);
         DeviceSet(TUF_KB_BRIGHTNESS, param, "TUF Brightness");
-        if (AppConfig.IsVivoZenPro()) DeviceSet(VIVO_KB_BRIGHTNESS, param, "VIVO Brightness");
 
     }
 
@@ -831,6 +830,7 @@ public class AsusACPI
         state = state | 0x01 << 8;
 
         DeviceSet(TUF_KB_STATE, state, "TUF_KB");
+        if (AppConfig.IsVivoZenPro() && DeviceGet(KBD_BACKLIGHT_OOBE) >= 0) DeviceSet(KBD_BACKLIGHT_OOBE, 1, "VIVO OOBE");
     }
 
     public void SubscribeToEvents(Action<object, EventArrivedEventArgs> EventHandler)

app/AsusMouseSettings.cs

@@ -326,7 +326,8 @@ namespace GHelper
                 return;
             }
 
-            LightingMode lm = supportedLightingModes[comboBoxLightingMode.SelectedIndex];
+            var index = comboBoxLightingMode.SelectedIndex;
+            LightingMode lm = supportedLightingModes[index < supportedLightingModes.Count ? index : 0 ];
 
             LightingSetting? ls = mouse.LightingSettingForZone(visibleZone);
             if (ls.LightingMode == lm)

app/AutoUpdate/AutoUpdateControl.cs

@@ -145,7 +145,7 @@ namespace GHelper.AutoUpdate
                     Logger.WriteLine(ex.Message);
                 }
 
-                Environment.Exit(0);
+                Application.Exit();
             }
 
         }

app/Display/ScreenControl.cs

@@ -6,7 +6,14 @@ 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)
         {
@@ -15,7 +22,7 @@ namespace GHelper.Display
                 if (SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online)
                     SetScreen(MAX_REFRESH, 1);
                 else
-                    SetScreen(60, 0);
+                    SetScreen(MIN_RATE, 0);
             }
             else
             {
@@ -29,7 +36,7 @@ namespace GHelper.Display
             var refreshRate = ScreenNative.GetRefreshRate(laptopScreen);
             if (refreshRate < 0) return;
 
-            ScreenNative.SetRefreshRate(laptopScreen, refreshRate > 60 ? 60 : ScreenNative.GetMaxRefreshRate(laptopScreen));
+            ScreenNative.SetRefreshRate(laptopScreen, refreshRate > MIN_RATE ? MIN_RATE : GetMaxRate(laptopScreen));
             InitScreen();
         }
 
@@ -43,7 +50,7 @@ namespace GHelper.Display
 
             if (frequency >= MAX_REFRESH)
             {
-                frequency = ScreenNative.GetMaxRefreshRate(laptopScreen);
+                frequency = GetMaxRate(laptopScreen);
             }
 
             if (frequency > 0 && frequency != refreshRate)
@@ -151,7 +158,7 @@ namespace GHelper.Display
         {
             var laptopScreen = ScreenNative.FindLaptopScreen();
             int frequency = ScreenNative.GetRefreshRate(laptopScreen);
-            int maxFrequency = ScreenNative.GetMaxRefreshRate(laptopScreen);
+            int maxFrequency = GetMaxRate(laptopScreen);
 
             if (maxFrequency > 0) AppConfig.Set("max_frequency", maxFrequency);
             else maxFrequency = AppConfig.Get("max_frequency");

app/Display/VisualControl.cs

@@ -1,4 +1,5 @@
 using GHelper.Helpers;
+using Microsoft.Win32;
 using System.Management;
 
 namespace GHelper.Display
@@ -37,6 +38,7 @@ namespace GHelper.Display
         Cinema = 25,
         Vivid = 13,
         Eyecare = 17,
+        Disabled = 18,
     }
     public static class VisualControl
     {
@@ -99,7 +101,7 @@ namespace GHelper.Display
                 foreach (FileInfo icm in icms)
                 {
                     //Logger.WriteLine(icm.FullName);
-                    
+
                     if (icm.Name.Contains("sRGB"))
                     {
                         try
@@ -107,7 +109,7 @@ namespace GHelper.Display
                             _modes.Add(isVivo ? SplendidGamut.VivoSRGB : SplendidGamut.sRGB, "Gamut: sRGB");
                             Logger.WriteLine(icm.FullName + " sRGB");
                         }
-                        catch 
+                        catch
                         {
                         }
                     }
@@ -175,7 +177,8 @@ namespace GHelper.Display
                 { SplendidCommand.FPS, "FPS"},
                 { SplendidCommand.Cinema, "Cinema"},
                 { SplendidCommand.Vivid, "Vivid" },
-                { SplendidCommand.Eyecare, "Eyecare"}
+                { SplendidCommand.Eyecare, "Eyecare"},
+                { SplendidCommand.Disabled, "Disabled"}
             };
         }
 
@@ -205,6 +208,20 @@ 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;
@@ -235,7 +252,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.Default || mode == SplendidCommand.VivoNormal) && init) return; // Skip default setting on init
+            if ((mode == SplendidCommand.Disabled || 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;
@@ -245,12 +262,16 @@ namespace GHelper.Display
 
             if (whiteBalance != DefaultColorTemp && !init) ProcessHelper.RunAsAdmin();
 
-            int? balance;
+            int? balance = null;
+            int command = 0;
 
             switch (mode)
             {
+                case SplendidCommand.Disabled:
+                    command = 2;
+                    break;
                 case SplendidCommand.Eyecare:
-                    balance = 2;
+                    balance = 4;
                     break;
                 case SplendidCommand.VivoNormal:
                 case SplendidCommand.VivoVivid:
@@ -264,7 +285,7 @@ namespace GHelper.Display
                     break;
             }
 
-            var result = RunSplendid(mode, 0, balance);
+            int result = RunSplendid(mode, command, balance);
             if (result == 0) return;
             if (result == -1)
             {
@@ -321,6 +342,11 @@ 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/Extra.cs

@@ -505,7 +505,10 @@ namespace GHelper
                 return;
             }
 
-            eCoresMax = Math.Max(8, eCoresMax);
+            if (eCoresMax == 0) eCoresMax = 8;
+            if (pCoresMax == 0) pCoresMax = 6;
+
+            eCoresMax = Math.Max(4, eCoresMax);
             pCoresMax = Math.Max(6, pCoresMax);
 
             panelCores.Visible = true;

app/GHelper.csproj

@@ -15,7 +15,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.192</AssemblyVersion>
+    <AssemblyVersion>0.197</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -63,8 +63,8 @@
     <PackageReference Include="NAudio" Version="2.1.0" />
     <PackageReference Include="NvAPIWrapper.Net" Version="0.8.1.101" />
     <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="TaskScheduler" Version="2.10.1" />
-    <PackageReference Include="WinForms.DataVisualization" Version="1.8.0" />
+    <PackageReference Include="TaskScheduler" Version="2.11.0" />
+    <PackageReference Include="WinForms.DataVisualization" Version="1.9.2" />
   </ItemGroup>
 
   <ItemGroup>

app/Gpu/GPUModeControl.cs

@@ -92,13 +92,16 @@ namespace GHelper.Gpu
                 {
                     if (AppConfig.NoAutoUltimate())
                     {
-                        int standardStatus = Program.acpi.SetGPUEco(0);
-                        if (standardStatus == 0)
+                        Program.acpi.SetGPUEco(0);
+                        Thread.Sleep(500);
+
+                        int eco = Program.acpi.DeviceGet(AsusACPI.GPUEco);
+                        Logger.WriteLine("Eco flag : " + eco);
+                        if (eco == 1)
                         {
                             settings.VisualiseGPUMode();
                             return;
                         }
-                        Thread.Sleep(100);
                     }
                     status = Program.acpi.DeviceSet(AsusACPI.GPUMux, 0, "GPUMux");
                     restart = true;

app/Handheld.cs

@@ -94,7 +94,7 @@ namespace GHelper
         private void CheckController_CheckedChanged(object? sender, EventArgs e)
         {
             AppConfig.Set("controller_disabled", checkController.Checked ? 1 : 0);
-            AllyControl.ApplyXBoxStatus();
+            AllyControl.DisableXBoxController(checkController.Checked);
         }
 
         private void ComboBinding(RComboBox combo)

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,6 +34,20 @@ 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
@@ -226,8 +240,16 @@ 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(1) });
+            td.Triggers.Add(new LogonTrigger { UserId = WindowsIdentity.GetCurrent().Name, Delay = TimeSpan.FromSeconds(2) });
             td.Actions.Add(strExeFilePath);
 
             if (ProcessHelper.IsUserAdministrator())

app/Helpers/TouchscreenHelper.cs

@@ -2,21 +2,31 @@
 
 public static class TouchscreenHelper
 {
-    public static bool? ToggleTouchscreen()
+
+    public static bool? GetStatus()
     {
         try
         {
             ProcessHelper.RunAsAdmin();
+            return ProcessHelper.RunCMD("powershell", "(Get-PnpDevice -FriendlyName '*touch*screen*').Status").Contains("OK");
+        }
+        catch (Exception ex)
+        {
+            Logger.WriteLine($"Can't get touchscreen status: {ex.Message}");
+            return null;
+        }
+    }
 
-            var status = !ProcessHelper.RunCMD("powershell", "(Get-PnpDevice -FriendlyName '*touch*screen*').Status").Contains("OK");
+    public static void ToggleTouchscreen(bool status)
+    {
+        try
+        {
+            ProcessHelper.RunAsAdmin();
             ProcessHelper.RunCMD("powershell", (status ? "Enable-PnpDevice" : "Disable-PnpDevice") + " -InstanceId (Get-PnpDevice -FriendlyName '*touch*screen*').InstanceId -Confirm:$false");
-            
-            return status;
         }
         catch (Exception ex)
         {
             Logger.WriteLine($"Can't toggle touchscreen: {ex.Message}");
-            return null;
         }
 
     }

app/Input/InputDispatcher.cs

@@ -118,6 +118,13 @@ 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);
@@ -129,8 +136,6 @@ 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);
@@ -435,6 +440,12 @@ 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;
@@ -591,9 +602,13 @@ namespace GHelper.Input
                     Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
                     break;
                 case "touchscreen":
-                    var touchscreenStatus = TouchscreenHelper.ToggleTouchscreen();
-                    if (touchscreenStatus is not null)
-                        Program.toast.RunToast(Properties.Strings.Touchscreen + " " + ((bool)touchscreenStatus ? Properties.Strings.On : Properties.Strings.Off), ToastIcon.Touchpad);
+                    var status = !TouchscreenHelper.GetStatus();
+                    Logger.WriteLine("Touchscreen status: " + status);
+                    if (status is not null)
+                    {
+                        Program.toast.RunToast(Properties.Strings.Touchscreen + " " + ((bool)status ? Properties.Strings.On : Properties.Strings.Off), ToastIcon.Touchpad);
+                        TouchscreenHelper.ToggleTouchscreen((bool)status);
+                    }
                     break;
                 default:
                     break;
@@ -731,6 +746,7 @@ 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,6 +10,8 @@ namespace GHelper.Input
         CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
         Action<int> _handler;
 
+        static int retry = 0;
+
         public KeyboardListener(Action<int> KeyHandler)
         {
             _handler = KeyHandler;
@@ -67,6 +69,12 @@ 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/Mode/ModeControl.cs

@@ -270,9 +270,6 @@ namespace GHelper.Mode
             var stapmResult = SendCommand.set_stapm_limit((uint)limit_total * 1000);
             if (init) Logger.WriteLine($"STAPM: {limit_total} {stapmResult}");
 
-            var stapmResult2 = SendCommand.set_stapm2_limit((uint)limit_total * 1000);
-            if (init) Logger.WriteLine($"STAPM2: {limit_total} {stapmResult2}");
-
             var slowResult = SendCommand.set_slow_limit((uint)limit_slow * 1000);
             if (init) Logger.WriteLine($"SLOW: {limit_slow} {slowResult}");
 

app/Peripherals/Mouse/Models/StrixImpact.cs

@@ -86,7 +86,7 @@
 
         public override int DPIIncrements()
         {
-            return 100;
+            return 50;
         }
 
 

app/Properties/Strings.lt.resx

@@ -250,13 +250,13 @@
     <value>Pabudęs</value>
   </data>
   <data name="BacklightLow" xml:space="preserve">
-    <value>Low</value>
+    <value>Žem.</value>
   </data>
   <data name="BacklightMax" xml:space="preserve">
-    <value>Max</value>
+    <value>Maks.</value>
   </data>
   <data name="BacklightMid" xml:space="preserve">
-    <value>Mid</value>
+    <value>Vid.</value>
   </data>
   <data name="BacklightOff" xml:space="preserve">
     <value>Išjungta</value>
@@ -265,10 +265,10 @@
     <value>Laiko riba su lizdu / akumuliatoriumi (0 – ĮJUNGTA)</value>
   </data>
   <data name="BacklightTimeoutBattery" xml:space="preserve">
-    <value>Backlight Timeout when on battery</value>
+    <value>Foninio apšvietimo laikas akumuliatoriaus režimu</value>
   </data>
   <data name="BacklightTimeoutPlugged" xml:space="preserve">
-    <value>Backlight Timeout when plugged</value>
+    <value>Foninio apšvietimo laikas įkraunant</value>
   </data>
   <data name="Balanced" xml:space="preserve">
     <value>Balansuotas</value>
@@ -519,7 +519,7 @@ Vis tiek norite tęsti?</value>
     <value>Kairiojo jungiklio nejautrumo zonos</value>
   </data>
   <data name="LTDeadzones" xml:space="preserve">
-    <value>Left Trigger Deadzones</value>
+    <value>Kairiojo jungiklio nejautrumo zonos</value>
   </data>
   <data name="MatrixAudio" xml:space="preserve">
     <value>Garso vizualizatorius</value>
@@ -585,13 +585,13 @@ Vis tiek norite tęsti?</value>
     <value>Sinchronizuoti su pele</value>
   </data>
   <data name="Multizone" xml:space="preserve">
-    <value>Multi Zone</value>
+    <value>Kelios zonos</value>
   </data>
   <data name="MultizoneStrong" xml:space="preserve">
-    <value>Multi Zone Strong</value>
+    <value>Kelių zonų stiprumas</value>
   </data>
   <data name="Muted" xml:space="preserve">
-    <value>Muted</value>
+    <value>Išjungta</value>
   </data>
   <data name="MuteMic" xml:space="preserve">
     <value>Mikrofono nutildymas</value>
@@ -615,7 +615,7 @@ Vis tiek norite tęsti?</value>
     <value>Įjungta</value>
   </data>
   <data name="OneZone" xml:space="preserve">
-    <value>One Zone</value>
+    <value>Viena zona</value>
   </data>
   <data name="OpenGHelper" xml:space="preserve">
     <value>Atidaryti G-Helper langą</value>
@@ -675,16 +675,16 @@ Vis tiek norite tęsti?</value>
     <value>RPM</value>
   </data>
   <data name="RSDeadzones" xml:space="preserve">
-    <value>Right Stick Deadzones</value>
+    <value>Dešiniojo jungiklio nejautrumo zonos</value>
   </data>
   <data name="RTDeadzones" xml:space="preserve">
-    <value>Right Trigger Deadzones</value>
+    <value>Dešiniojo jungiklio nejautrumo zonos</value>
   </data>
   <data name="RunOnStartup" xml:space="preserve">
     <value>Paleisti įjungus sistemą</value>
   </data>
   <data name="ScalingQuality" xml:space="preserve">
-    <value>Scaling Quality</value>
+    <value>Mastelio kokybė</value>
   </data>
   <data name="ScreenPadDown" xml:space="preserve">
     <value>Ekrano skydelio ryškumo mažinimas</value>
@@ -741,10 +741,10 @@ Vis tiek norite tęsti?</value>
     <value>Perjungti ekraną</value>
   </data>
   <data name="ToggleTouchscreen" xml:space="preserve">
-    <value>Toggle Touchscreen</value>
+    <value>Valdyti jutiklinį ekraną</value>
   </data>
   <data name="Touchscreen" xml:space="preserve">
-    <value>Touchscreen</value>
+    <value>Jutiklinis ekranas</value>
   </data>
   <data name="Turbo" xml:space="preserve">
     <value>Turbo</value>
@@ -765,7 +765,7 @@ Vis tiek norite tęsti?</value>
     <value>Įtampos mažinimas yra eksperimentinė ir pavojinga funkcija. Jei pritaikytos reikšmės yra per mažos jūsų aparatinei įrangai, ji gali tapti nestabili, išsijungti arba pažeisti duomenų vientisumą. Jei norite pabandyti, iš pirmo pradėkite nuo mažų reikšmių, spustelėkite „Taikyti“ ir išbandykite, kas jums tinka.</value>
   </data>
   <data name="Unmuted" xml:space="preserve">
-    <value>Unmuted</value>
+    <value>Įjungta</value>
   </data>
   <data name="Updates" xml:space="preserve">
     <value>Naujinimai</value>
@@ -798,24 +798,24 @@ Vis tiek norite tęsti?</value>
     <value>Visada rodyti programėlės langą viršuje</value>
   </data>
   <data name="Zoom" xml:space="preserve">
-    <value>Zoom</value>
+    <value>Mastelis</value>
   </data>
   <data name="Donate" xml:space="preserve">
-    <value>Donate</value>
+    <value>Paremti</value>
   </data>
   <data name="Legend" xml:space="preserve">
-    <value>Legend</value>
+    <value>Legenda</value>
   </data>
   <data name="LegendGray" xml:space="preserve">
-    <value>Can't check local version</value>
+    <value>Nepavyko patikrinti vietinės versijos</value>
     <comment>Can't check local version</comment>
   </data>
   <data name="LegendRed" xml:space="preserve">
-    <value>Update Available</value>
+    <value>Išleista nauja versija</value>
     <comment>Update Available</comment>
   </data>
   <data name="LegendGreen" xml:space="preserve">
-    <value>Updated</value>
+    <value>Atnaujinta</value>
     <comment>Updated</comment>
   </data>
 </root>

app/Properties/Strings.zh-TW.resx

@@ -157,7 +157,7 @@
     <value>程式正在執行</value>
   </data>
   <data name="AppAlreadyRunningText" xml:space="preserve">
-    <value>G-Helper正在執行。 請檢查右下系統匣。</value>
+    <value>G-Helper 正在執行。 請檢查右下系統匣。</value>
   </data>
   <data name="Apply" xml:space="preserve">
     <value>套用</value>
@@ -169,10 +169,10 @@
     <value>套用功率限制</value>
   </data>
   <data name="ApplyWindowsPowerPlan" xml:space="preserve">
-    <value>自動調整Windows電源模式</value>
+    <value>自動調整 Windows 電源模式</value>
   </data>
   <data name="APUMemory" xml:space="preserve">
-    <value>分配給GPU的記憶體</value>
+    <value>分配給 GPU 的記憶體</value>
   </data>
   <data name="AsusServicesRunning" xml:space="preserve">
     <value>執行中的華碩服務</value>
@@ -295,7 +295,7 @@
     <value>次要</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
-    <value>BIOS與驅動程式更新</value>
+    <value>BIOS 與驅動程式更新</value>
   </data>
   <data name="Boot" xml:space="preserve">
     <value>開機時</value>

app/Ryzen/RyzenControl.cs

@@ -40,7 +40,8 @@ namespace Ryzen
         //PHEONIX - 9
         //RAPHAEL/DRAGON RANGE - 10
         //MENDOCINO - 11
-        //HAWKPOINT/STRIXPOINT - 12
+        //HAWKPOINT - 12
+        //STRIXPOINT - 13
 
         public static void Init()
         {
@@ -129,7 +130,7 @@ namespace Ryzen
 
             if (CPUModel.Contains("Family " + Convert.ToString(26)) && CPUModel.Contains("Model " + Convert.ToString(36)))
             {
-                FAMID = 12; //STRIXPOINT 
+                FAMID = 13; //STRIXPOINT 
             }
 
             Logger.WriteLine($"CPU: {FAMID} - {CPUName} - {CPUModel}");
@@ -243,6 +244,16 @@ namespace Ryzen
                 Smu.PSMU_ADDR_RSP = 0x3B10a80;
                 Smu.PSMU_ADDR_ARG = 0x3B10a88;
             }
+            else if (FAMID == 13)
+            {
+                Smu.MP1_ADDR_MSG = 0x3B10928;
+                Smu.MP1_ADDR_RSP = 0x3B10978;
+                Smu.MP1_ADDR_ARG = 0x3B10998;
+
+                Smu.PSMU_ADDR_MSG = 0x3B10a20;
+                Smu.PSMU_ADDR_RSP = 0x3B10a80;
+                Smu.PSMU_ADDR_ARG = 0x3B10a88;
+            }
             else if (FAMID == 4 || FAMID == 6)
             {
                 Smu.MP1_ADDR_MSG = 0x3B10530;

app/Ryzen/SendCommand.cs

@@ -21,7 +21,8 @@ namespace Ryzen
         //PHEONIX - 9
         //RAPHAEL/DRAGON RANGE - 10
         //MENDOCINO - 11
-        //HAWKPOINT/STRIXPOINT - 12
+        //HAWKPOINT - 12
+        //STRIXPOINT - 13
 
         public static Smu RyzenAccess = new Smu(false);
         public static int FAMID = RyzenControl.FAMID;
@@ -49,7 +50,8 @@ namespace Ryzen
                 case 9:
                 case 11:
                 case 12:
-                    RyzenAccess.SendMp1(0x14, ref Args);
+                case 13:
+                    result = RyzenAccess.SendMp1(0x14, ref Args);
                     result = RyzenAccess.SendPsmu(0x31, ref Args);
                     break;
                 default:
@@ -61,32 +63,6 @@ namespace Ryzen
             
         }
 
-        //STAMP2 Limit
-        public static Smu.Status? set_stapm2_limit(uint value)
-        {
-            RyzenAccess.Initialize();
-            uint[] Args = new uint[6];
-            Args[0] = value;
-            Smu.Status? result = null;
-
-            switch (FAMID)
-            {
-                case 3:
-                case 5:
-                case 7:
-                case 8:
-                case 9:
-                case 11:
-                case 12:
-                    result = RyzenAccess.SendPsmu(0x31, ref Args);
-                    break;
-                default:
-                    break;
-            }
-            RyzenAccess.Deinitialize();
-            return result;
-        }
-
         //Fast Limit
         public static Smu.Status? set_fast_limit(uint value)
         {
@@ -109,7 +85,9 @@ namespace Ryzen
                 case 9:
                 case 11:
                 case 12:
+                case 13:
                     result = RyzenAccess.SendMp1(0x15, ref Args);
+                    result = RyzenAccess.SendPsmu(0x32, ref Args);
                     break;
                 default:
                     break;
@@ -140,7 +118,10 @@ namespace Ryzen
                 case 9:
                 case 11:
                 case 12:
+                case 13:
                     result = RyzenAccess.SendMp1(0x16, ref Args);
+                    result = RyzenAccess.SendPsmu(0x33, ref Args);
+                    result = RyzenAccess.SendPsmu(0x34, ref Args);
                     break;
                 default:
                     break;
@@ -176,11 +157,12 @@ namespace Ryzen
                 case 9:
                 case 11:
                 case 12:
+                case 13:
                     result = RyzenAccess.SendMp1(0x19, ref Args);
                     break;
                 case 4:
                 case 6:
-                    RyzenAccess.SendMp1(0x23, ref Args);
+                    result = RyzenAccess.SendMp1(0x23, ref Args);
                     result = RyzenAccess.SendPsmu(0x56, ref Args);
                     break;
                 case 10:
@@ -194,37 +176,6 @@ namespace Ryzen
             return result;
         }
 
-        //Skin Temp limit
-        public static Smu.Status? set_apu_skin_temp_limit(uint value)
-        {
-            RyzenAccess.Initialize();
-            uint[] Args = new uint[6];
-            Args[0] = value;
-
-            Smu.Status? result = null;
-
-            switch (FAMID)
-            {
-                case 5:
-                case 8:
-                case 9:
-                case 11:
-                case 12:
-                    result = RyzenAccess.SendMp1(0x33, ref Args);
-                    break;
-                case 3:
-                case 7:
-                    result = RyzenAccess.SendMp1(0x38, ref Args);
-                    break;
-                default:
-                    break;
-            }
-
-            RyzenAccess.Deinitialize();
-
-            return result;
-        }
-
         //Set All Core Curve Optimiser
         public static Smu.Status? set_coall(int value)
         {
@@ -241,12 +192,12 @@ namespace Ryzen
             {
                 case 3:
                 case 7:
-                    RyzenAccess.SendMp1(0x55, ref Args);
+                    result = RyzenAccess.SendMp1(0x55, ref Args);
                     result = RyzenAccess.SendPsmu(0xB1, ref Args);
                     break;
                 case 4:
                 case 6:
-                    RyzenAccess.SendMp1(0x36, ref Args);
+                    result = RyzenAccess.SendMp1(0x36, ref Args);
                     result = RyzenAccess.SendPsmu(0xB, ref Args);
                     break;
                 case 5:
@@ -254,6 +205,7 @@ namespace Ryzen
                 case 9:
                 case 11:
                 case 12:
+                case 13:
                     result = RyzenAccess.SendPsmu(0x5D, ref Args);
                     break;
                 case 10:
@@ -285,7 +237,7 @@ namespace Ryzen
             {
                 case 3:
                 case 7:
-                    RyzenAccess.SendMp1(0x64, ref Args);
+                    result = RyzenAccess.SendMp1(0x64, ref Args);
                     result = RyzenAccess.SendPsmu(0x57, ref Args);
                     break;
                 case 5:
@@ -293,6 +245,7 @@ namespace Ryzen
                 case 9:
                 case 11:
                 case 12:
+                case 13:
                     result = RyzenAccess.SendPsmu(0xb7, ref Args);
                     break;
                 default:

app/Settings.cs

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

app/Updates.cs

@@ -226,13 +226,10 @@ namespace GHelper
 
         public void _VisualiseNewCount(int updatesCount, TableLayoutPanel table)
         {
-            Invoke(delegate
-            {
-                labelUpdates.Text = $"{Properties.Strings.NewUpdates}: {updatesCount}";
-                labelUpdates.ForeColor = colorTurbo;
-                labelUpdates.Font = new Font(labelUpdates.Font, FontStyle.Bold);
-                panelBios.AccessibleName = labelUpdates.Text;
-            });
+            labelUpdates.Text = $"{Properties.Strings.NewUpdates}: {updatesCount}";
+            labelUpdates.ForeColor = colorTurbo;
+            labelUpdates.Font = new Font(labelUpdates.Font, FontStyle.Bold);
+            panelBios.AccessibleName = labelUpdates.Text;
         }
 
         static string CleanupDeviceId(string input)