Fix for GA402XI

app/AnimeMatrix/AnimeMatrixDevice.cs

@@ -1,6 +1,6 @@
 // Source thanks to https://github.com/vddCore/Starlight with some adjustments from me
 
-using Starlight.Communication;
+using GHelper.AnimeMatrix.Communication;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
 using System.Globalization;

app/AnimeMatrix/Communication/Device.cs

@@ -1,9 +1,8 @@
 // Source thanks to https://github.com/vddCore/Starlight :)
 
-using Starlight.Communication.Platform;
+using GHelper.AnimeMatrix.Communication.Platform;
-using System.Configuration;
 
-namespace Starlight.Communication
+namespace GHelper.AnimeMatrix.Communication
 {
     public abstract class Device : IDisposable
     {

app/AnimeMatrix/Communication/Packet.cs

@@ -1,6 +1,6 @@
 // Source thanks to https://github.com/vddCore/Starlight :)
 
-namespace Starlight.Communication
+namespace GHelper.AnimeMatrix.Communication
 {
     public abstract class Packet
     {

app/AnimeMatrix/Communication/Platform/UsbProvider.cs

@@ -1,4 +1,4 @@
-namespace Starlight.Communication.Platform
+namespace GHelper.AnimeMatrix.Communication.Platform
 {
     internal abstract class UsbProvider : IDisposable
     {
@@ -13,7 +13,7 @@ namespace Starlight.Communication.Platform
 
         public abstract void Set(byte[] data);
         public abstract byte[] Get(byte[] data);
-        
+
         public abstract void Dispose();
     }
 }

app/AnimeMatrix/Communication/Platform/WindowsUsbProvider.cs

@@ -1,14 +1,14 @@
 using System.ComponentModel;
 using HidSharp;
 
-namespace Starlight.Communication.Platform
+namespace GHelper.AnimeMatrix.Communication.Platform
 {
     internal class WindowsUsbProvider : UsbProvider
     {
         protected HidDevice HidDevice { get; }
         protected HidStream HidStream { get; }
 
-        public WindowsUsbProvider(ushort vendorId, ushort productId, int maxFeatureReportLength) 
+        public WindowsUsbProvider(ushort vendorId, ushort productId, int maxFeatureReportLength)
             : base(vendorId, productId)
         {
             try
@@ -43,7 +43,7 @@ namespace Starlight.Communication.Platform
         {
             var outData = new byte[data.Length];
             Array.Copy(data, outData, data.Length);
-            
+
             WrapException(() =>
             {
                 HidStream.GetFeature(outData);
@@ -57,7 +57,7 @@ namespace Starlight.Communication.Platform
         {
             HidStream.Dispose();
         }
-        
+
         private void WrapException(Action action)
         {
             try

app/Fans.cs

@@ -267,32 +267,33 @@ namespace GHelper
             int igpuUV = Math.Max(trackUViGPU.Minimum, Math.Min(trackUViGPU.Maximum, AppConfig.GetMode("igpu_uv", 0)));
 
             int temp = AppConfig.GetMode("cpu_temp");
-            if (temp < trackTemp.Minimum || temp > trackTemp.Maximum) temp = 96;
+            if (temp < RyzenControl.MinTemp || temp > RyzenControl.MaxTemp) temp = RyzenControl.MaxTemp;
 
             checkApplyUV.Enabled = checkApplyUV.Checked = AppConfig.IsMode("auto_uv");
 
             trackUV.Value = cpuUV;
-            labelUV.Text = trackUV.Value.ToString();
-
             trackUViGPU.Value = igpuUV;
-            labelUViGPU.Text = trackUViGPU.Value.ToString();
-
             trackTemp.Value = temp;
-            labelTemp.Text = trackTemp.Value.ToString() + "°C";
 
+            VisualiseAdvanced();
 
             buttonAdvanced.Visible = RyzenControl.IsAMD();
 
         }
 
+        private void VisualiseAdvanced()
+        {
+            labelUV.Text = trackUV.Value.ToString();
+            labelUViGPU.Text = trackUViGPU.Value.ToString();
+            labelTemp.Text = (trackTemp.Value < RyzenControl.MaxTemp) ? trackTemp.Value.ToString() + "°C" : "Default";
+        }
+
         private void AdvancedScroll()
         {
             AppConfig.SetMode("auto_uv", 0);
             checkApplyUV.Enabled = checkApplyUV.Checked = false;
 
-            labelUV.Text = trackUV.Value.ToString();
+            VisualiseAdvanced();
-            labelUViGPU.Text = trackUViGPU.Value.ToString();
-            labelTemp.Text = trackTemp.Value.ToString() + "°C";
 
             AppConfig.SetMode("cpu_temp", trackTemp.Value);
             AppConfig.SetMode("cpu_uv", trackUV.Value);
@@ -839,10 +840,9 @@ namespace GHelper
             AppConfig.SetMode("auto_apply", 0);
             AppConfig.SetMode("auto_apply_power", 0);
 
-
+            trackUV.Value = RyzenControl.MaxCPUUV;
-            trackUV.Value = 0;
+            trackUViGPU.Value = RyzenControl.MaxIGPUUV;
-            trackUViGPU.Value = 0;
+            trackTemp.Value = RyzenControl.MaxTemp;
-            trackTemp.Value = 96;
 
             AdvancedScroll();
             AppConfig.SetMode("cpu_temp", -1);

app/GHelper.csproj

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

app/Input/InputDispatcher.cs

@@ -12,7 +12,7 @@ namespace GHelper.Input
     public class InputDispatcher
     {
         System.Timers.Timer timer = new System.Timers.Timer(1000);
-        public bool backlightActivity = true;
+        public static bool backlightActivity = true;
 
         public static Keys keyProfile = Keys.F5;
         public static Keys keyApp = Keys.F12;
@@ -342,6 +342,8 @@ namespace GHelper.Input
 
         public static void TabletMode()
         {
+            if (AppConfig.Is("disable_tablet")) return;
+
             bool touchpadState = GetTouchpadState();
             bool tabletState = Program.acpi.DeviceGet(AsusACPI.TabletState) > 0;
 

app/Input/KeyboardListener.cs

@@ -10,7 +10,20 @@ namespace GHelper.Input
         public KeyboardListener(Action<int> KeyHandler)
         {
             HidDevice? input = AsusUSB.GetDevice();
-            if (input == null) return;
+            
+            // Fallback
+            if (input == null)
+            {
+                AsusUSB.Init();
+                Thread.Sleep(1000);
+                input = AsusUSB.GetDevice();
+            }
+
+            if (input == null)
+            {
+                Logger.WriteLine($"Input device not found");
+                return;
+            }
 
             Logger.WriteLine($"Input: {input.DevicePath}");
 

app/Mode/ModeControl.cs

@@ -171,6 +171,11 @@ namespace GHelper.Mode
                 AppConfig.ContainsModel("G733");
         }
 
+        private static bool IsFanRequired()
+        {
+            return AppConfig.ContainsModel("GA402XI") || AppConfig.ContainsModel("G513");
+        }
+
         public void AutoPower(int delay = 0)
         {
 
@@ -182,8 +187,8 @@ namespace GHelper.Mode
 
             if (applyPower)
             {
-                // force fan curve for misbehaving bios PPTs on G513
+                // force fan curve for misbehaving bios PPTs on some models
-                if (AppConfig.ContainsModel("G513") && !applyFans)
+                if (!applyFans && IsFanRequired())
                 {
                     delay = 500;
                     AutoFans(true);
@@ -342,7 +347,7 @@ namespace GHelper.Mode
 
         public void SetCPUTemp(int? cpuTemp, bool log = true)
         {
-            if (cpuTemp >= RyzenControl.MinTemp && cpuTemp <= RyzenControl.MaxTemp)
+            if (cpuTemp >= RyzenControl.MinTemp && cpuTemp < RyzenControl.MaxTemp)
             {
                 var resultCPU = SendCommand.set_tctl_temp((uint)cpuTemp);
                 if (log) Logger.WriteLine($"CPU Temp: {cpuTemp} {resultCPU}");