Aura tweaks

app/AppConfig.cs

@@ -1,5 +1,4 @@
 using GHelper.Mode;
-using System.Diagnostics;
 using System.Management;
 using System.Text.Json;
 
@@ -13,6 +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);
 
     static AppConfig()
     {
@@ -24,7 +24,8 @@ public static class AppConfig
         if (File.Exists(startupPath + configName))
         {
             configFile = startupPath + configName;
-        } else
+        }
+        else
         {
             configFile = appPath + configName;
         }
@@ -51,8 +52,39 @@ public static class AppConfig
             Init();
         }
 
+        timer.Elapsed += Timer_Elapsed;
+
     }
 
+    private static void Timer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
+    {
+
+        timer.Stop();
+        string jsonString = JsonSerializer.Serialize(config, new JsonSerializerOptions { WriteIndented = true });
+        var backup = configFile + ".bak";
+
+        try
+        {
+            File.WriteAllText(backup, jsonString);
+        }
+        catch (Exception ex)
+        {
+            Logger.WriteLine(ex.ToString());
+            return;
+        }
+
+        Thread.Sleep(500);
+
+        if (File.ReadAllText(backup).Contains("}"))
+        {
+            File.Copy(backup, configFile, true);
+        }
+        else
+        {
+            Logger.WriteLine("Error writing config");
+        }
+
+    }
 
     public static string GetModel()
     {
@@ -156,15 +188,7 @@ public static class AppConfig
 
     private static void Write()
     {
-        string jsonString = JsonSerializer.Serialize(config, new JsonSerializerOptions { WriteIndented = true });
-        try
-        {
-            File.WriteAllText(configFile, jsonString);
-        }
-        catch (Exception e)
-        {
-            Debug.Write(e.ToString());
-        }
+        timer.Start();
     }
 
     public static void Set(string name, int value)
@@ -328,7 +352,7 @@ public static class AppConfig
     // Devices with bugged bios command to change brightness
     public static bool SwappedBrightness()
     {
-        return ContainsModel("FA506IH") || ContainsModel("FA506IC") || ContainsModel("FX506LU") || ContainsModel("FX506IC") || ContainsModel("FX506LH");
+        return ContainsModel("FA506IH") || ContainsModel("FA506IC") || ContainsModel("FX506LU") || ContainsModel("FX506IC") || ContainsModel("FX506LH") || ContainsModel("FA506IV");
     }
 
 
@@ -345,7 +369,7 @@ public static class AppConfig
 
     public static bool IsSingleColor()
     {
-        return  ContainsModel("GA401") || ContainsModel("FX517Z") || ContainsModel("FX516P") || ContainsModel("X13") || IsARCNM() || ContainsModel("GA502IU");
+        return ContainsModel("GA401") || ContainsModel("FX517Z") || ContainsModel("FX516P") || ContainsModel("X13") || IsARCNM() || ContainsModel("GA502IU");
     }
 
     public static bool IsStrix()
@@ -355,7 +379,12 @@ public static class AppConfig
 
     public static bool IsStrixLimitedRGB()
     {
-        return ContainsModel("G614JV") || ContainsModel("G614JZ") || ContainsModel("G512LI") || ContainsModel("G513R") || ContainsModel("G713PV") || ContainsModel("G513IE") || ContainsModel("G713RC");
+        return ContainsModel("G614JV") || ContainsModel("G614JZ") || ContainsModel("G512LI") || ContainsModel("G513R") || ContainsModel("G713PV") || ContainsModel("G513IE") || ContainsModel("G713RC") || ContainsModel("G513QM");
+    }
+
+    public static bool IsNoDirectRGB()
+    {
+        return ContainsModel("GA503");
     }
 
     public static bool IsStrixNumpad()
@@ -413,13 +442,14 @@ public static class AppConfig
 
     public static bool IsFanScale()
     {
-        if (!ContainsModel("GU604")) return false; 
+        if (!ContainsModel("GU604")) return false;
 
         try
         {
             var (bios, model) = GetBiosAndModel();
             return (Int32.Parse(bios) < 312);
-        } catch
+        }
+        catch
         {
             return false;
         }
@@ -435,11 +465,6 @@ public static class AppConfig
         return ContainsModel("FX507") || ContainsModel("FX517") || ContainsModel("FX707");
     }
 
-    public static bool IsGPUFixNeeded()
-    {
-        return ContainsModel("GA402X") || ContainsModel("GV302") || ContainsModel("GV301") || ContainsModel("GZ301") || ContainsModel("FX506") || ContainsModel("FA506") || ContainsModel("GU603") || ContainsModel("GU604") || ContainsModel("G614J") || ContainsModel("GA503") || ContainsModel("FX507");
-    }
-
     public static bool IsGPUFix()
     {
         return Is("gpu_fix") || (ContainsModel("GA402X") && IsNotFalse("gpu_fix"));

app/AsusACPI.cs

@@ -554,6 +554,11 @@ public class AsusACPI
         return DeviceGet(PPT_CPUB0) >= 0 && DeviceGet(PPT_GPUC0) < 0;
     }
 
+    public bool IsNVidiaGPU()
+    {
+        return (!IsAllAmdPPT() && Program.acpi.DeviceGet(GPUEco) >= 0 && !AppConfig.IsAlly());
+    }
+
     public void SetAPUMem(int memory = 4)
     {
         if (memory < 0 || memory > 8) return;

app/AsusMouseSettings.cs

@@ -863,7 +863,14 @@ namespace GHelper
 
         private void VisualizeCurrentDPIProfile()
         {
+            if (mouse.DpiProfile > mouse.DpiSettings.Count())
+            {
+                Logger.WriteLine($"Wrong mouse DPI: {mouse.DpiProfile}");
+                return;
+            }
+
             AsusMouseDPI dpi = mouse.DpiSettings[mouse.DpiProfile - 1];
+            
             if (dpi is null)
             {
                 return;

app/Extra.Designer.cs

@@ -1267,6 +1267,7 @@ namespace GHelper
             // 
             AutoScaleDimensions = new SizeF(192F, 192F);
             AutoScaleMode = AutoScaleMode.Dpi;
+            AutoScroll = true;
             AutoSize = true;
             AutoSizeMode = AutoSizeMode.GrowAndShrink;
             ClientSize = new Size(1013, 1515);

app/Extra.cs

@@ -379,7 +379,7 @@ namespace GHelper
 
             pictureLog.Click += PictureLog_Click;
 
-            checkGPUFix.Visible = AppConfig.IsGPUFixNeeded();
+            checkGPUFix.Visible = Program.acpi.IsNVidiaGPU();
             checkGPUFix.Checked = AppConfig.IsGPUFix();
             checkGPUFix.CheckedChanged += CheckGPUFix_CheckedChanged;
 
@@ -634,7 +634,17 @@ namespace GHelper
         {
             if (Height > Program.settingsForm.Height)
             {
-                Top = Program.settingsForm.Top + Program.settingsForm.Height - Height;
+                var top = Program.settingsForm.Top + Program.settingsForm.Height - Height;
+
+                if (top < 0)
+                {
+                    MaximumSize = new Size(Width, Program.settingsForm.Height);
+                    Top = Program.settingsForm.Top;
+                } else
+                {
+                    Top = top;
+                }
+
             }
             else
             {

app/GHelper.csproj

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

app/Gpu/NVidia/NvidiaGpuControl.cs

@@ -13,10 +13,10 @@ public class NvidiaGpuControl : IGpuControl
 {
 
     public static int MaxCoreOffset => AppConfig.Get("max_gpu_core", 250);
-    public static int MaxMemoryOffset => AppConfig.Get("max_gpu_memory", 250);
+    public static int MaxMemoryOffset => AppConfig.Get("max_gpu_memory", 500);
 
     public static int MinCoreOffset = AppConfig.Get("min_gpu_core", -250);
-    public static int MinMemoryOffset = AppConfig.Get("min_gpu_memory", -250);
+    public static int MinMemoryOffset = AppConfig.Get("min_gpu_memory", -500);
 
     public const int MinClockLimit = 400;
     public const int MaxClockLimit = 3000;

app/Input/InputDispatcher.cs

@@ -429,6 +429,7 @@ namespace GHelper.Input
                     NativeMethods.TurnOffScreen();
                     break;
                 case "miniled":
+                    if (ScreenCCD.GetHDRStatus()) return;
                     int miniled = screenControl.ToogleMiniled();
                     Program.toast.RunToast(miniled == 1 ? "Multi-Zone" : "Single-Zone", miniled == 1 ? ToastIcon.BrightnessUp : ToastIcon.BrightnessDown);
                     break;

app/Peripherals/Mouse/Models/GladiusII.cs

@@ -0,0 +1,243 @@
+namespace GHelper.Peripherals.Mouse.Models
+{
+    //P504
+    public class GladiusIIOrigin : AsusMouse
+    {
+        public GladiusIIOrigin() : base(0x0B05, 0x1877, "mi_02", false)
+        {
+        }
+
+        public GladiusIIOrigin(ushort productId, string path) : base(0x0B05, productId, path, false)
+        {
+        }
+
+        public override int DPIProfileCount()
+        {
+            return 2;
+        }
+
+        public override string GetDisplayName()
+        {
+            return "Gladius II Origin";
+        }
+
+
+        public override PollingRate[] SupportedPollingrates()
+        {
+            return new PollingRate[] {
+                PollingRate.PR125Hz,
+                PollingRate.PR250Hz,
+                PollingRate.PR500Hz,
+                PollingRate.PR1000Hz
+            };
+        }
+
+        public override int ProfileCount()
+        {
+            return 1;
+        }
+        public override int MaxDPI()
+        {
+            return 12_000;
+        }
+
+        public override bool HasRGB()
+        {
+            return true;
+        }
+
+        public override bool HasAutoPowerOff()
+        {
+            return false;
+        }
+
+        public override bool HasAngleSnapping()
+        {
+            return true;
+        }
+
+        public override bool HasAngleTuning()
+        {
+            return false;
+        }
+
+        public override bool HasDebounceSetting()
+        {
+            return true;
+        }
+        public override bool HasLiftOffSetting()
+        {
+            return true;
+        }
+
+        public override bool HasLowBatteryWarning()
+        {
+            return false;
+        }
+
+        public override bool HasBattery()
+        {
+            return false;
+        }
+
+        public override bool HasDPIColors()
+        {
+            return false;
+        }
+
+        public override bool IsLightingModeSupported(LightingMode lightingMode)
+        {
+            return lightingMode == LightingMode.Static
+                || lightingMode == LightingMode.Breathing
+                || lightingMode == LightingMode.ColorCycle
+                || lightingMode == LightingMode.Rainbow
+                || lightingMode == LightingMode.React
+                || lightingMode == LightingMode.Comet;
+        }
+
+        public override LightingZone[] SupportedLightingZones()
+        {
+            return new LightingZone[] { LightingZone.Logo, LightingZone.Scrollwheel, LightingZone.Underglow };
+        }
+
+        public override int DPIIncrements()
+        {
+            return 100;
+        }
+
+        public override bool CanChangeDPIProfile()
+        {
+            return true;
+        }
+
+        public override int MaxBrightness()
+        {
+            return 4;
+        }
+
+        protected override byte[] GetUpdateLightingModePacket(LightingSetting lightingSetting, LightingZone zone)
+        {
+            /*
+             * This mouse uses different speed values for rainbow mode compared to others.
+             * 51 28 03 00 03 04 FF 00 00 00 00 [8C] 00 00 00 00
+             * 51 28 03 00 03 04 FF 00 00 00 00 [64] 00 00 00 00
+             * 51 28 03 00 03 04 FF 00 00 00 00 [3F] 00 00 00 00
+             */
+
+            if (lightingSetting.LightingMode == LightingMode.Rainbow)
+            {
+                byte speed = 0x3F;
+
+                switch (lightingSetting.AnimationSpeed)
+                {
+                    case AnimationSpeed.Slow:
+                        speed = 0x3F;
+                        break;
+                    case AnimationSpeed.Medium:
+                        speed = 0x64;
+                        break;
+                    case AnimationSpeed.Fast:
+                        speed = 0x8C;
+                        break;
+                }
+
+                return new byte[] { reportId, 0x51, 0x28, (byte)zone, 0x00,
+                    IndexForLightingMode(lightingSetting.LightingMode),
+                    (byte)lightingSetting.Brightness,
+                    0xFF, 0x00, 0x00,
+                    (byte)(SupportsAnimationDirection(lightingSetting.LightingMode) ? lightingSetting.AnimationDirection : 0x00),
+                    (byte)((lightingSetting.RandomColor && SupportsRandomColor(lightingSetting.LightingMode)) ? 0x01: 0x00),
+                    (byte)(SupportsAnimationSpeed(lightingSetting.LightingMode) ? speed : 0x00)
+                };
+            }
+
+            return base.GetUpdateLightingModePacket(lightingSetting, zone);
+        }
+
+        protected override byte[] GetReadLightingModePacket(LightingZone zone)
+        {
+            return new byte[] { 0x00, 0x12, 0x03, 0x00 };
+        }
+
+        protected LightingSetting? ParseLightingSetting(byte[] packet, LightingZone zone)
+        {
+            if (packet[1] != 0x12 || packet[2] != 0x03)
+            {
+                return null;
+            }
+
+            int offset = 5 + (((int)zone) * 5);
+
+            LightingSetting setting = new LightingSetting();
+
+            setting.LightingMode = LightingModeForIndex(packet[offset + 0]);
+            setting.Brightness = packet[offset + 1];
+
+            setting.RGBColor = Color.FromArgb(packet[offset + 2], packet[offset + 3], packet[offset + 4]);
+
+
+            return setting;
+        }
+
+        public override void ReadLightingSetting()
+        {
+            if (!HasRGB())
+            {
+                return;
+            }
+            //Mouse sends all lighting zones in one response                       Direction, Random col, Speed
+            //00 12 03 00 00 [00 04 ff 00 80] [00 04 00 ff ff] [00 04 ff ff ff] 00 [00] [00] [00] 00 00 
+            //00 12 03 00 00 [03 04 00 00 00] [03 04 00 00 00] [03 04 00 00 00] 00 [00] [00] [07] 00 00
+            byte[]? response = WriteForResponse(GetReadLightingModePacket(LightingZone.All));
+            if (response is null) return;
+
+            LightingZone[] lz = SupportedLightingZones();
+            for (int i = 0; i < lz.Length; ++i)
+            {
+                LightingSetting? ls = ParseLightingSetting(response, lz[i]);
+                if (ls is null)
+                {
+                    Logger.WriteLine(GetDisplayName() + ": Failed to read RGB Setting for Zone " + lz[i].ToString());
+                    continue;
+                }
+                ls.AnimationDirection = SupportsAnimationDirection(ls.LightingMode)
+                   ? (AnimationDirection)response[21]
+                   : AnimationDirection.Clockwise;
+
+                ls.RandomColor = SupportsRandomColor(ls.LightingMode) && response[22] == 0x01;
+
+                ls.AnimationSpeed = SupportsAnimationSpeed(ls.LightingMode)
+                    ? (AnimationSpeed)response[23]
+                    : AnimationSpeed.Medium;
+
+                if (ls.AnimationSpeed != AnimationSpeed.Fast
+                    && ls.AnimationSpeed != AnimationSpeed.Medium
+                    && ls.AnimationSpeed != AnimationSpeed.Slow)
+                {
+                    ls.AnimationSpeed = AnimationSpeed.Medium;
+                }
+
+                Logger.WriteLine(GetDisplayName() + ": Read RGB Setting for Zone " + lz[i].ToString() + ": " + ls.ToString());
+                LightingSetting[i] = ls;
+            }
+        }
+    }
+
+    //P502
+    public class GladiusII : GladiusIIOrigin
+    {
+        public GladiusII() : base(0x1845, "mi_02")
+        {
+
+        }
+        public override string GetDisplayName()
+        {
+            return "Gladius II Origin";
+        }
+
+        public override int ProfileCount()
+        {
+            return 3;
+        }
+    }
+}

app/Peripherals/PeripheralsProvider.cs

@@ -187,6 +187,8 @@ namespace GHelper.Peripherals
             DetectMouse(new ChakramXWired());
             DetectMouse(new GladiusIIIAimpoint());
             DetectMouse(new GladiusIIIAimpointWired());
+            DetectMouse(new GladiusIIOrigin());
+            DetectMouse(new GladiusII());
             DetectMouse(new ROGKerisWireless());
             DetectMouse(new ROGKerisWirelessWired());
             DetectMouse(new ROGKerisWirelessEvaEdition());

app/Properties/Strings.es.resx

@@ -250,10 +250,10 @@
     <value>Tiempo de espera conectado / con batería (0 - ON)</value>
   </data>
   <data name="BacklightTimeoutBattery" xml:space="preserve">
-    <value>Backlight Timeout when on battery</value>
+    <value>Tiempo de retroiluminación con batería</value>
   </data>
   <data name="BacklightTimeoutPlugged" xml:space="preserve">
-    <value>Backlight Timeout when plugged</value>
+    <value>Tiempo de retroiluminación conectado</value>
   </data>
   <data name="Balanced" xml:space="preserve">
     <value>Equilibrado</value>

app/Properties/Strings.pl.resx

@@ -250,10 +250,10 @@
     <value>Limit czasu podłączonego / na baterii (0 - Włączony)</value>
   </data>
   <data name="BacklightTimeoutBattery" xml:space="preserve">
-    <value>Backlight Timeout when on battery</value>
+    <value>Czas podświetlenia na baterii</value>
   </data>
   <data name="BacklightTimeoutPlugged" xml:space="preserve">
-    <value>Backlight Timeout when plugged</value>
+    <value>Czas podświetlenia po podłączeniu</value>
   </data>
   <data name="Balanced" xml:space="preserve">
     <value>Balans</value>

app/Properties/Strings.zh-CN.resx

@@ -250,10 +250,10 @@
     <value>插电/电池时熄灭时间（0表示长亮）</value>
   </data>
   <data name="BacklightTimeoutBattery" xml:space="preserve">
-    <value>Backlight Timeout when on battery</value>
+    <value>充电模式下的背光超时</value>
   </data>
   <data name="BacklightTimeoutPlugged" xml:space="preserve">
-    <value>Backlight Timeout when plugged</value>
+    <value>电源模式下的背光超时</value>
   </data>
   <data name="Balanced" xml:space="preserve">
     <value>平衡模式</value>

app/USB/Aura.cs

@@ -533,7 +533,7 @@ namespace GHelper.USB
                 return;
             }
 
-            if (AppConfig.ContainsModel("GA503"))
+            if (AppConfig.IsNoDirectRGB())
             {
                 AsusHid.Write(new List<byte[]> { AuraMessage(AuraMode.AuraStatic, color, color, 0xeb, isSingleColor), MESSAGE_SET });
                 return;
@@ -582,7 +582,7 @@ namespace GHelper.USB
             {
                 CustomRGB.ApplyAmbient(true);
                 timer.Enabled = true;
-                timer.Interval = AppConfig.Get("aura_refresh", 120);
+                timer.Interval = AppConfig.Get("aura_refresh", AppConfig.ContainsModel("GU604") ? 400 : 120);
                 return;
             }
 

docs/README.md

@@ -90,6 +90,7 @@ Each BIOS mode is paired with matching Windows Power Mode. You can adjust this s
 - ROG Chakram X (P708)
 - ROG Chakram Core (P511)
 - ROG Strix III Gladius III Aimpoint Wireless (P711)
+- ROG Gladius II and Gladius II Origin (P502 and P504)
 - ROG Gladius III
 - ROG Gladius III Wireless
 - ROG Strix Impact II Wireless