Max fan speeds for FX607J

app/AnimeMatrix/AniMatrixControl.cs

@@ -59,18 +59,6 @@ namespace GHelper.AnimeMatrix
             if (deviceSlash is not null) SetSlash(wakeUp);
         }
 
-        public void SetLidMode(bool force = false)
-        {
-            bool matrixLid = AppConfig.Is("matrix_lid");
-            if (matrixLid || force)
-            {
-                Logger.WriteLine($"Matrix LidClosed: {lidClose}");
-                if (deviceSlash is not null) deviceSlash.SetLidMode(matrixLid);
-                SetDevice(true);
-            }
-        }
-
-
         public void SetSlash(bool wakeUp = false)
         {
             if (deviceSlash is null) return;
@@ -110,16 +98,48 @@ namespace GHelper.AnimeMatrix
                     }
 
                     deviceSlash.Init();
-                    deviceSlash.SetMode((SlashMode)running);
-                    deviceSlash.SetOptions(true, brightness, inteval);
-                    deviceSlash.Save();
+                    
+                    switch ((SlashMode)running)
+                    {
+                        case SlashMode.Static:
+                            deviceSlash.SetStatic(brightness);
+                            break;
+                        default:
+                            deviceSlash.SetMode((SlashMode)running);
+                            deviceSlash.SetOptions(true, brightness, inteval);
+                            deviceSlash.Save();
+                            break;
+                    }
                 }
             });
         }
 
+        public void SetLidMode(bool force = false)
+        {
+            bool matrixLid = AppConfig.Is("matrix_lid");
+            
+            if (deviceSlash is not null)
+            {
+                deviceSlash.SetLidMode(matrixLid);
+                deviceSlash.SetSleepActive(!matrixLid);
+            }
+
+            if (matrixLid || force)
+            {
+                Logger.WriteLine($"Matrix LidClosed: {lidClose}");
+                SetDevice(true);
+            }
+        }
+
         public void SetBatteryAuto()
         {
-            if (deviceSlash is not null) deviceSlash.SetBatterySaver(AppConfig.Is("matrix_auto"));
+            if (deviceSlash is not null)
+            {
+                bool auto = AppConfig.Is("matrix_auto");
+                deviceSlash.SetBatterySaver(auto);
+                if (!auto) SetSlash();
+            }
+
             if (deviceMatrix is not null) SetMatrix();
         }
 

app/AnimeMatrix/SlashDevice.cs

@@ -19,7 +19,8 @@ namespace GHelper.AnimeMatrix
         Ramp,
         GameOver,
         Start,
-        Buzzer
+        Buzzer,
+        Static
     }
 
     internal class SlashPacket : Packet
@@ -53,6 +54,7 @@ namespace GHelper.AnimeMatrix
             { SlashMode.GameOver, "Game Over"},
             { SlashMode.Start, "Start"},
             { SlashMode.Buzzer, "Buzzer"},
+            { SlashMode.Static, "Static"},
         };
 
         private static Dictionary<SlashMode, byte> modeCodes = new Dictionary<SlashMode, byte>
@@ -115,6 +117,17 @@ namespace GHelper.AnimeMatrix
             Set(Packet<SlashPacket>(0xD3, 0x04, 0x00, 0x0C, 0x01, modeByte, 0x02, 0x19, 0x03, 0x13, 0x04, 0x11, 0x05, 0x12, 0x06, 0x13), "SlashMode");
         }
 
+        public void SetStatic(int brightness = 0)
+        {
+            byte brightnessByte = (byte)(brightness * 85.333);
+
+            Set(Packet<SlashPacket>(0xD2, 0x02, 0x01, 0x08, 0xAC), "Static");
+            Set(Packet<SlashPacket>(0xD3, 0x03, 0x01, 0x08, 0xAC, 0xFF, 0xFF, 0x01, 0x05, 0xFF, 0xFF), "StaticSettings");
+            Set(Packet<SlashPacket>(0xD4, 0x00, 0x00, 0x01, 0xAC), "StaticSave");
+
+            Set(Packet<SlashPacket>(0xD3, 0x00, 0x00, 0x07, brightnessByte, brightnessByte, brightnessByte, brightnessByte, brightnessByte, brightnessByte, brightnessByte), "Static White");
+        }
+
         public void SetOptions(bool status, int brightness = 0, int interval = 0)
         {
             byte brightnessByte = (byte)(brightness * 85.333);
@@ -124,12 +137,18 @@ namespace GHelper.AnimeMatrix
 
         public void SetBatterySaver(bool status)
         {
-            Set(Packet<SlashPacket>(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00), "SlashBatterySaver");
+            Set(Packet<SlashPacket>(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00), $"SlashBatterySaver {status}");
         }
 
         public void SetLidMode(bool status)
         {
-            Set(Packet<SlashPacket>(0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00));
+            Set(Packet<SlashPacket>(0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00), $"DisableLidClose {status}");
+        }
+
+        public void SetSleepActive(bool status)
+        {
+            Set(Packet<SlashPacket>(0xD2, 0x02, 0x01, 0x08, 0xA1), "SleepInit");
+            Set(Packet<SlashPacket>(0xD3, 0x03, 0x01, 0x08, 0xA1, 0x00, 0xFF, status ? (byte)0x01 : (byte)0x00, 0x02, 0xFF, 0xFF), $"Sleep {status}");
         }
 
         public void Set(Packet packet, string? log = null)

app/AppConfig.cs

@@ -404,9 +404,14 @@ public static class AppConfig
         return ContainsModel("GA503") || IsSlash();
     }
 
+    public static bool IsInvertedFNLock()
+    {
+        return ContainsModel("M140");
+    }
+
     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("K340") || ContainsModel("K350");
+        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("K340") || ContainsModel("K350") || ContainsModel("M140") || ContainsModel("UM340");
     }
 
     public static bool IsNoOverdrive()
@@ -426,7 +431,7 @@ public static class AppConfig
 
     public static bool IsStrixLimitedRGB()
     {
-        return (ContainsModel("G614JV") || ContainsModel("G614JZ") || ContainsModel("G512LI") || ContainsModel("G513R") || ContainsModel("G713PV") || ContainsModel("G513IE") || ContainsModel("G713RC") || ContainsModel("G513QM") || ContainsModel("G531G")) && !Is("per_key_rgb");
+        return (ContainsModel("G614JV_") || ContainsModel("G614JZ") || ContainsModel("G512LI") || ContainsModel("G513R") || ContainsModel("G713PV") || ContainsModel("G513IE") || ContainsModel("G713RC") || ContainsModel("G513QM") || ContainsModel("G531G")) && !Is("per_key_rgb");
     }
 
 
@@ -591,11 +596,6 @@ public static class AppConfig
         return ContainsModel("G814") || ContainsModel("G614") || ContainsModel("G834") || ContainsModel("G634");
     }
 
-    public static bool IsNewAura()
-    {
-        return ContainsModel("G834") || ContainsModel("G614") || ContainsModel("G834") || ContainsModel("G634");
-    }
-
     public static bool IsNoFNV()
     {
         return ContainsModel("FX507") || ContainsModel("FX707");

app/AsusMouseSettings.cs

@@ -866,14 +866,23 @@ namespace GHelper
 
         private void VisualizeCurrentDPIProfile()
         {
-            if (mouse.DpiProfile > mouse.DpiSettings.Count())
+            if (mouse.DpiProfile > mouse.DpiSettings.Length)
             {
                 Logger.WriteLine($"Wrong mouse DPI: {mouse.DpiProfile}");
                 return;
             }
 
-            AsusMouseDPI dpi = mouse.DpiSettings[mouse.DpiProfile - 1];
-            
+            AsusMouseDPI dpi;
+
+            try
+            {
+                dpi = mouse.DpiSettings[mouse.DpiProfile - 1];
+            } catch (Exception ex)
+            {
+                Logger.WriteLine($"Wrong mouse DPI: {mouse.DpiProfile} {mouse.DpiSettings.Length} {ex.Message}");
+                return;
+            }
+
             if (dpi is null)
             {
                 return;

app/Display/VisualControl.cs

@@ -66,6 +66,11 @@ namespace GHelper.Display
             return Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\ASUS\\ASUS System Control Interface\\ASUSOptimization\\Splendid";
         }
 
+        public static SplendidGamut GetDefaultGamut()
+        {
+            return AppConfig.IsVivoZenbook() ? SplendidGamut.VivoNative : SplendidGamut.Native;
+        }
+
         public static Dictionary<SplendidGamut, string> GetGamutModes()
         {
 
@@ -104,6 +109,11 @@ namespace GHelper.Display
 
         }
 
+        public static SplendidCommand GetDefaultVisualMode()
+        {
+            return AppConfig.IsVivoZenbook() ? SplendidCommand.VivoNormal : SplendidCommand.Default;
+        }
+
         public static Dictionary<SplendidCommand, string> GetVisualModes()
         {
 

app/Fan/FanSensorControl.cs

@@ -58,6 +58,8 @@ namespace GHelper.Fan
             if (AppConfig.ContainsModel("FA507R")) return new int[3] { 63, 57, DEFAULT_FAN_MAX };
             if (AppConfig.ContainsModel("FA507X")) return new int[3] { 63, 68, DEFAULT_FAN_MAX };
 
+            if (AppConfig.ContainsModel("FX607J")) return new int[3] { 74, 72, DEFAULT_FAN_MAX };
+
             if (AppConfig.ContainsModel("GX650")) return new int[3] { 62, 62, DEFAULT_FAN_MAX };
 
             if (AppConfig.ContainsModel("G732")) return new int[3] { 61, 60, DEFAULT_FAN_MAX };
@@ -68,6 +70,7 @@ namespace GHelper.Fan
             if (AppConfig.ContainsModel("GV601")) return new int[3] { 78, 59, 85 };
 
             if (AppConfig.ContainsModel("GA403")) return new int[3] { 68, 68, 80 };
+            if (AppConfig.ContainsModel("GU605")) return new int[3] { 62, 62, 92 };
 
             return new int[3] { DEFAULT_FAN_MAX, DEFAULT_FAN_MAX, DEFAULT_FAN_MAX };
         }

app/GHelper.csproj

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

app/Input/InputDispatcher.cs

@@ -85,7 +85,8 @@ namespace GHelper.Input
 
             InitBacklightTimer();
 
-            if (AppConfig.IsVivoZenbook()) Program.acpi.DeviceSet(AsusACPI.FnLock, AppConfig.Is("fn_lock") ? 1 : 0, "FnLock");
+            if (AppConfig.IsVivoZenbook())
+                Program.acpi.DeviceSet(AsusACPI.FnLock, AppConfig.Is("fn_lock") ^ AppConfig.IsInvertedFNLock() ? 1 : 0, "FnLock");
 
         }
 
@@ -585,17 +586,17 @@ namespace GHelper.Input
 
         public static void ToggleFnLock()
         {
-            int fnLock = AppConfig.Is("fn_lock") ? 0 : 1;
-            AppConfig.Set("fn_lock", fnLock);
+            bool fnLock = !AppConfig.Is("fn_lock");
+            AppConfig.Set("fn_lock", fnLock ? 1 : 0);
 
             if (AppConfig.IsVivoZenbook())
-                Program.acpi.DeviceSet(AsusACPI.FnLock, fnLock == 1 ? 1 : 0, "FnLock");
+                Program.acpi.DeviceSet(AsusACPI.FnLock, fnLock ^ AppConfig.IsInvertedFNLock() ? 1 : 0, "FnLock");
             else
                 Program.settingsForm.BeginInvoke(Program.inputDispatcher.RegisterKeys);
 
             Program.settingsForm.BeginInvoke(Program.settingsForm.VisualiseFnLock);
 
-            Program.toast.RunToast(fnLock == 1 ? Properties.Strings.FnLockOn : Properties.Strings.FnLockOff, ToastIcon.FnLock);
+            Program.toast.RunToast(fnLock ? Properties.Strings.FnLockOn : Properties.Strings.FnLockOff, ToastIcon.FnLock);
         }
 
         public static void TabletMode()

app/Properties/Resources.resx

@@ -139,12 +139,6 @@
   <data name="icons8-bicycle-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="eco" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icons8_mute_unmute_96" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-mute-unmute-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -226,9 +220,6 @@
   <data name="icons8-hibernate-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-hibernate-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ultimate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icons8-keyboard-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -349,10 +340,19 @@
   <data name="dark_standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dark-standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="eco" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="light_eco" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\light-eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="light_standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\light-standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ultimate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

app/Properties/Strings.tr.resx

@@ -139,7 +139,7 @@
     <value>Ultimate Modu kapatmak yeniden başlatmayı gerektirir</value>
   </data>
   <data name="AlertUltimateOn" xml:space="preserve">
-    <value>Ultimate Modu etkinleştirmek yeniden başlatmayı gerektirir</value>
+    <value>Ultimate Mod için yeniden başlatılmalı</value>
   </data>
   <data name="AlertUltimateTitle" xml:space="preserve">
     <value>Şimdi yeniden başlatılsın mı?</value>
@@ -387,7 +387,7 @@ Yine de devam etmek istiyor musunuz?</value>
     <value>Profili Dışa Aktar</value>
   </data>
   <data name="Extra" xml:space="preserve">
-    <value>Ekstra</value>
+    <value>Ek Özellikler</value>
   </data>
   <data name="ExtraSettings" xml:space="preserve">
     <value>Ek Ayarlar</value>
@@ -420,10 +420,10 @@ Yine de devam etmek istiyor musunuz?</value>
     <value>Fanlar + Güç</value>
   </data>
   <data name="FlickerFreeDimming" xml:space="preserve">
-    <value>Flicker-free Dimming</value>
+    <value>Titreşimsiz Karartma</value>
   </data>
   <data name="FnLock" xml:space="preserve">
-    <value>Fn+F kısayol tuşlarını FN tuşuna basmadan çalıştır</value>
+    <value>Fn+F kısayolunu Fn tuşuna basmadan çalıştır</value>
   </data>
   <data name="FnLockOff" xml:space="preserve">
     <value>FN-Lock Kapalı</value>
@@ -603,7 +603,7 @@ Yine de devam etmek istiyor musunuz?</value>
     <value>Yeni güncellemeler</value>
   </data>
   <data name="NoNewUpdates" xml:space="preserve">
-    <value>Güncelleme yok</value>
+    <value>Yeni güncelleme yok</value>
   </data>
   <data name="NotConnected" xml:space="preserve">
     <value>Bağlı Değil</value>
@@ -675,7 +675,7 @@ Yine de devam etmek istiyor musunuz?</value>
     <value>RPM</value>
   </data>
   <data name="RSDeadzones" xml:space="preserve">
-    <value>Sağ Joystick Ölü Bölgeleri</value>
+    <value>Sağ Çubuk Ölü Bölgeleri</value>
   </data>
   <data name="RTDeadzones" xml:space="preserve">
     <value>Sağ Tetik Ölü Bölgeleri</value>

app/Properties/Strings.zh-TW.resx

@@ -507,7 +507,7 @@
     <value>亮度</value>
   </data>
   <data name="LockScreen" xml:space="preserve">
-    <value>Lock Screen</value>
+    <value>鎖定螢幕</value>
   </data>
   <data name="Logo" xml:space="preserve">
     <value>Logo</value>

app/Settings.cs

@@ -323,7 +323,7 @@ namespace GHelper
             panelGamma.Visible = true;
             tableVisual.Visible = true;
 
-            var visualValue = (SplendidCommand)AppConfig.Get("visual", (int)SplendidCommand.Default);
+            var visualValue = (SplendidCommand)AppConfig.Get("visual", (int)VisualControl.GetDefaultVisualMode());
             var colorTempValue = AppConfig.Get("color_temp", VisualControl.DefaultColorTemp);
 
             comboVisual.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -352,7 +352,7 @@ namespace GHelper
             comboGamut.DataSource = new BindingSource(gamuts, null);
             comboGamut.DisplayMember = "Value";
             comboGamut.ValueMember = "Key";
-            comboGamut.SelectedValue = (SplendidGamut)AppConfig.Get("gamut", (int)SplendidGamut.Native);
+            comboGamut.SelectedValue = (SplendidGamut)AppConfig.Get("gamut", (int)VisualControl.GetDefaultGamut());
 
             comboGamut.SelectedValueChanged += ComboGamut_SelectedValueChanged;
             comboGamut.Visible = true;

app/USB/Aura.cs

@@ -268,25 +268,6 @@ namespace GHelper.USB
                 Encoding.ASCII.GetBytes("]ASUS Tech.Inc."),
                 new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x1A },
             }, "Init");
-
-            // Random data AC sends to keyboard on start, that seem to wake up keyboard on 2024 
-            if (AppConfig.IsNewAura())
-            {
-                AsusHid.Write(new List<byte[]> {
-                    new byte[] { AsusHid.AURA_ID, 0x9F, 0x01 },
-                    new byte[] { AsusHid.AURA_ID, 0xBF },
-
-                    new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x10 },
-                    new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x20 },
-
-                    new byte[] { AsusHid.AURA_ID, 0xC0, 0x03, 0x01 },
-                    new byte[] { AsusHid.AURA_ID, 0x9E, 0x01, 0x20 },
-
-                    Encoding.ASCII.GetBytes("]ASUS Tech.Inc."),
-                    new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x1A },
-                    new byte[] { AsusHid.AURA_ID, 0xC0, 0x00, 0x01 },
-                }, "Init");
-            }
         }
 
 

app/Updates.cs

@@ -1,5 +1,4 @@
 using GHelper.UI;
-using Ryzen;
 using System.Diagnostics;
 using System.Management;
 using System.Net;
@@ -63,12 +62,12 @@ namespace GHelper
 
             Task.Run(async () =>
             {
-                DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDBIOS?website=global&model={model}&cpu=CPUNAME", model, 1, tableBios);
+                DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDBIOS?website=global&model={model}&cpu={model}", 1, tableBios);
             });
 
             Task.Run(async () =>
             {
-                DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDDrivers?website=global&model={model}&cpu=CPUNAME&osid=52", model, 0, tableDrivers);
+                DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDDrivers?website=global&model={model}&cpu={model}&osid=52", 0, tableDrivers);
             });
         }
 
@@ -224,7 +223,7 @@ namespace GHelper
             return input;
         }
 
-        public async void DriversAsync(string url, string model, int type, TableLayoutPanel table)
+        public async void DriversAsync(string url, int type, TableLayoutPanel table)
         {
 
             try
@@ -234,12 +233,10 @@ namespace GHelper
                     AutomaticDecompression = DecompressionMethods.All
                 }))
                 {
-                    var urlNormal = url.Replace("CPUNAME", model);
-                    Logger.WriteLine(urlNormal);
-
+                    Logger.WriteLine(url);
                     httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip, deflate, br");
                     httpClient.DefaultRequestHeaders.Add("User-Agent", "C# App");
-                    var json = await httpClient.GetStringAsync(urlNormal);
+                    var json = await httpClient.GetStringAsync(url);
 
                     var data = JsonSerializer.Deserialize<JsonElement>(json);
                     var result = data.GetProperty("Result");
@@ -247,12 +244,11 @@ namespace GHelper
                     // fallback for bugged API
                     if (result.ToString() == "" || result.GetProperty("Obj").GetArrayLength() == 0)
                     {
-                        Random rnd = new Random();
-                        var urlFallback = url.Replace("CPUNAME", model + rnd.Next(10, 99));
+                        var urlFallback = url + "&tag=" + new Random().Next(10, 99);
                         Logger.WriteLine(urlFallback);
                         json = await httpClient.GetStringAsync(urlFallback);
                         data = JsonSerializer.Deserialize<JsonElement>(json);
-                    } 
+                    }
 
                     var groups = data.GetProperty("Result").GetProperty("Obj");