From df20fa63a9e346a37f9a2529796818ac162affdd Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sun, 14 Apr 2024 22:46:14 +0200 Subject: [PATCH 1/8] Clock reset fix --- app/Fans.cs | 2 +- app/Mode/ModeControl.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Fans.cs b/app/Fans.cs index b6930f34..f6125ba2 100644 --- a/app/Fans.cs +++ b/app/Fans.cs @@ -1166,7 +1166,7 @@ namespace GHelper InitGPUPower(); VisualiseGPUSettings(); - modeControl.SetGPUClocks(true); + modeControl.SetGPUClocks(true, true); modeControl.SetGPUPower(); } diff --git a/app/Mode/ModeControl.cs b/app/Mode/ModeControl.cs index ed2d99b2..92c74954 100644 --- a/app/Mode/ModeControl.cs +++ b/app/Mode/ModeControl.cs @@ -342,7 +342,7 @@ namespace GHelper.Mode } - public void SetGPUClocks(bool launchAsAdmin = true) + public void SetGPUClocks(bool launchAsAdmin = true, bool reset = false) { Task.Run(() => { @@ -351,6 +351,8 @@ namespace GHelper.Mode int memory = AppConfig.GetMode("gpu_memory"); int clock_limit = AppConfig.GetMode("gpu_clock_limit"); + if (reset) core = memory = clock_limit = 0; + if (core == -1 && memory == -1 && clock_limit == -1) return; //if ((gpu_core > -5 && gpu_core < 5) && (gpu_memory > -5 && gpu_memory < 5)) launchAsAdmin = false; From b219ff5af4886fb572213361387b70d342d3e614 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sun, 14 Apr 2024 23:25:10 +0200 Subject: [PATCH 2/8] Updates tweak --- app/Updates.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Updates.cs b/app/Updates.cs index 4f3bf8dc..ec9bc87d 100644 --- a/app/Updates.cs +++ b/app/Updates.cs @@ -1,4 +1,5 @@ using GHelper.UI; +using Ryzen; using System.Diagnostics; using System.Management; using System.Net; @@ -60,14 +61,16 @@ namespace GHelper ClearTable(tableBios); ClearTable(tableDrivers); + var cpu = RyzenControl.IsAMD() ? "A" : "I"; + Task.Run(async () => { - DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDBIOS?website=global&model={model}&cpu={model}", 1, tableBios); + DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDBIOS?website=global&model={model}&cpu={cpu}", 1, tableBios); }); Task.Run(async () => { - DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDDrivers?website=global&model={model}&cpu={model}&osid=52", 0, tableDrivers); + DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDDrivers?website=global&model={model}&cpu={cpu}&osid=52", 0, tableDrivers); }); } From 04143abf7ce3035ac596e30ea78e57211d07428d Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:05:43 +0200 Subject: [PATCH 3/8] Updates fix --- app/Updates.cs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/app/Updates.cs b/app/Updates.cs index ec9bc87d..e1b5d2ef 100644 --- a/app/Updates.cs +++ b/app/Updates.cs @@ -61,16 +61,14 @@ namespace GHelper ClearTable(tableBios); ClearTable(tableDrivers); - var cpu = RyzenControl.IsAMD() ? "A" : "I"; - Task.Run(async () => { - DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDBIOS?website=global&model={model}&cpu={cpu}", 1, tableBios); + DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDBIOS?website=global&model={model}&cpu=CPUNAME", model, 1, tableBios); }); Task.Run(async () => { - DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDDrivers?website=global&model={model}&cpu={cpu}&osid=52", 0, tableDrivers); + DriversAsync($"https://rog.asus.com/support/webapi/product/GetPDDrivers?website=global&model={model}&cpu=CPUNAME&osid=52", model, 0, tableDrivers); }); } @@ -226,7 +224,7 @@ namespace GHelper return input; } - public async void DriversAsync(string url, int type, TableLayoutPanel table) + public async void DriversAsync(string url, string model, int type, TableLayoutPanel table) { try @@ -236,11 +234,25 @@ namespace GHelper AutomaticDecompression = DecompressionMethods.All })) { + var urlNormal = url.Replace("CPUNAME", model); + Logger.WriteLine(urlNormal); + httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip, deflate, br"); httpClient.DefaultRequestHeaders.Add("User-Agent", "C# App"); - var json = await httpClient.GetStringAsync(url); + var json = await httpClient.GetStringAsync(urlNormal); var data = JsonSerializer.Deserialize(json); + + // fallback for bugged API + if (data.GetProperty("Result").ToString() == "") + { + Random rnd = new Random(); + var urlFallback = url.Replace("CPUNAME", model + rnd.Next(100, 999)); + Logger.WriteLine(urlFallback); + json = await httpClient.GetStringAsync(urlFallback); + data = JsonSerializer.Deserialize(json); + } + var groups = data.GetProperty("Result").GetProperty("Obj"); From f983bdac42918473bc824089f5c1d514d9899086 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:17:00 +0200 Subject: [PATCH 4/8] Updates fix --- app/Updates.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Updates.cs b/app/Updates.cs index e1b5d2ef..b512983d 100644 --- a/app/Updates.cs +++ b/app/Updates.cs @@ -242,12 +242,13 @@ namespace GHelper var json = await httpClient.GetStringAsync(urlNormal); var data = JsonSerializer.Deserialize(json); + var result = data.GetProperty("Result"); // fallback for bugged API - if (data.GetProperty("Result").ToString() == "") + if (result.ToString() == "" || result.GetProperty("Obj").GetArrayLength() == 0) { Random rnd = new Random(); - var urlFallback = url.Replace("CPUNAME", model + rnd.Next(100, 999)); + var urlFallback = url.Replace("CPUNAME", model + rnd.Next(10, 99)); Logger.WriteLine(urlFallback); json = await httpClient.GetStringAsync(urlFallback); data = JsonSerializer.Deserialize(json); From ebb8cda8f012aec3ec8f54f42c60a0e837ce0a77 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:17:59 +0200 Subject: [PATCH 5/8] New translations strings.resx (Turkish) (#2434) --- app/Properties/Strings.tr.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Properties/Strings.tr.resx b/app/Properties/Strings.tr.resx index 3420d8bf..579521ef 100644 --- a/app/Properties/Strings.tr.resx +++ b/app/Properties/Strings.tr.resx @@ -139,7 +139,7 @@ Ultimate Modu kapatmak yeniden başlatmayı gerektirir - Ultimate Modu etkinleştirmek yeniden başlatmayı gerektirir + Ultimate Mod için yeniden başlatılmalı Şimdi yeniden başlatılsın mı? @@ -387,7 +387,7 @@ Yine de devam etmek istiyor musunuz? Profili Dışa Aktar - Ekstra + Ek Özellikler Ek Ayarlar @@ -420,10 +420,10 @@ Yine de devam etmek istiyor musunuz? Fanlar + Güç - Flicker-free Dimming + Titreşimsiz Karartma - Fn+F kısayol tuşlarını FN tuşuna basmadan çalıştır + Fn+F kısayolunu Fn tuşuna basmadan çalıştır FN-Lock Kapalı @@ -603,7 +603,7 @@ Yine de devam etmek istiyor musunuz? Yeni güncellemeler - Güncelleme yok + Yeni güncelleme yok Bağlı Değil @@ -675,7 +675,7 @@ Yine de devam etmek istiyor musunuz? RPM - Sağ Joystick Ölü Bölgeleri + Sağ Çubuk Ölü Bölgeleri Sağ Tetik Ölü Bölgeleri From b41055ce0f33dfbc9777d26ef1708b987b701d0a Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:18:18 +0200 Subject: [PATCH 6/8] Updates tweaks --- app/Updates.cs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/Updates.cs b/app/Updates.cs index b512983d..6732ee96 100644 --- a/app/Updates.cs +++ b/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(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(json); - } + } var groups = data.GetProperty("Result").GetProperty("Obj"); From 300eb7af7027df4030c568fea63f0cb4d2372044 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Mon, 15 Apr 2024 19:32:29 +0200 Subject: [PATCH 7/8] Aura cleanup --- app/AppConfig.cs | 5 ----- app/USB/Aura.cs | 19 ------------------- 2 files changed, 24 deletions(-) diff --git a/app/AppConfig.cs b/app/AppConfig.cs index e3b9a78e..86d7a674 100644 --- a/app/AppConfig.cs +++ b/app/AppConfig.cs @@ -591,11 +591,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"); diff --git a/app/USB/Aura.cs b/app/USB/Aura.cs index ace3c794..6f0609c3 100644 --- a/app/USB/Aura.cs +++ b/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 { - 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"); - } } From fc1f594a6158b71b710809151724dc7243e01f41 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:24:55 +0200 Subject: [PATCH 8/8] Max fan speeds for GU605 --- app/Fan/FanSensorControl.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Fan/FanSensorControl.cs b/app/Fan/FanSensorControl.cs index d6d9ab78..4dde6533 100644 --- a/app/Fan/FanSensorControl.cs +++ b/app/Fan/FanSensorControl.cs @@ -68,6 +68,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 }; }