From 8eb17e2bc13ea23b92c0ba8088db6a4a39b05970 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 16 Mar 2024 10:23:51 +0100 Subject: [PATCH 1/6] Restore Fn-V for TUF --- app/Extra.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Extra.cs b/app/Extra.cs index 8bbd6a10..6fee7682 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -205,11 +205,7 @@ namespace GHelper labelFNF4.Visible = comboFNF4.Visible = textFNF4.Visible = false; } - if (AppConfig.IsTUF()) - { - labelFNV.Visible = comboFNV.Visible = textFNV.Visible = false; - } - else + if (!AppConfig.IsTUF()) { labelFNE.Visible = comboFNE.Visible = textFNE.Visible = false; } From e66e06a57cc476daf314ede8a49116a5e7c1e3b8 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 16 Mar 2024 10:39:32 +0100 Subject: [PATCH 2/6] Hide FN-V for FX507 model https://github.com/seerge/g-helper/issues/2221 --- app/AppConfig.cs | 7 +++++++ app/Extra.cs | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/app/AppConfig.cs b/app/AppConfig.cs index e7d7d9e2..48019590 100644 --- a/app/AppConfig.cs +++ b/app/AppConfig.cs @@ -587,6 +587,11 @@ public static class AppConfig return ContainsModel("G834") || ContainsModel("G614") || ContainsModel("G834") || ContainsModel("G634"); } + public static bool IsNoFNV() + { + return ContainsModel("FX507") || ContainsModel("FX707"); + } + public static bool IsROG() { return ContainsModel("ROG"); @@ -601,4 +606,6 @@ public static class AppConfig return Is("bw_icon"); } + + } diff --git a/app/Extra.cs b/app/Extra.cs index 6fee7682..d4f5f2d0 100644 --- a/app/Extra.cs +++ b/app/Extra.cs @@ -210,6 +210,11 @@ namespace GHelper labelFNE.Visible = comboFNE.Visible = textFNE.Visible = false; } + if (AppConfig.IsNoFNV()) + { + labelFNV.Visible = comboFNV.Visible = textFNV.Visible = false; + } + if (Program.acpi.DeviceGet(AsusACPI.GPUEco) < 0) { checkGpuApps.Visible = false; From c571cb3f3011e02ede35cd56fb2cab985ee7fc89 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:20:58 +0100 Subject: [PATCH 3/6] New Crowdin updates (#2231) * New translations strings.resx (Spanish) * New translations strings.resx (Spanish) * New translations strings.resx (Spanish) --- app/Properties/Strings.es.resx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Properties/Strings.es.resx b/app/Properties/Strings.es.resx index 6b98cb5c..84f418ad 100644 --- a/app/Properties/Strings.es.resx +++ b/app/Properties/Strings.es.resx @@ -250,16 +250,16 @@ Encendida - Low + Bajo - Max + Máximo - Mid + Medio - Off + Apagado Tiempo de espera conectado / con batería (0 - ON) @@ -355,7 +355,7 @@ Descargando - Download Color Profiles + Descargar perfiles de color Descargar @@ -585,7 +585,7 @@ Multizona fuerte - Muted + Silenciado Silenciar micrófono @@ -603,10 +603,10 @@ No conectado - Off + Apagado - On + Encendido Una zona @@ -753,7 +753,7 @@ Undervolting es una característica experimental. Aplicar valores demasiado bajos puede causar inestabilidad en el hardware o corrupción de datos. Si desea probar, empiece con valores pequeños, haga click en Aplicar y pruebe. - Unmuted + No silenciado Actualización @@ -765,7 +765,7 @@ Intensidad de vibración - Visual Mode + Modo visual Bajar volumen From 08c41301ea8190b6d478f981b2d8a87b040b7540 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:21:18 +0100 Subject: [PATCH 4/6] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index ca5bb818..fdf5f46c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,7 +3,7 @@ [![GitHub release](https://img.shields.io/github/release/seerge/g-helper)](https://GitHub.com/seerge/g-helper/releases/) [![Github all releases](https://img.shields.io/github/downloads/seerge/g-helper/total)](https://GitHub.com/seerge/g-helper/releases/) [![GitHub stars](https://img.shields.io/github/stars/seerge/g-helper.svg?style=social)](https://GitHub.com/seerge/g-helper/stargazers/) -Small and lightweight Armoury Crate alternative for Asus laptops offering almost same functionality without extra bloat and unnecessary services. +Small and lightweight Armoury Crate alternative for Asus laptops offering almost same functionality without extra load and unnecessary services. Works with all popular models, such as ROG Zephyrus G14, G15, G16, M16, Flow X13, Flow X16, Flow Z13, TUF Series, Strix / Scar Series, ProArt, VivoBook, Ally and many more! # [:floppy_disk:Download](https://github.com/seerge/g-helper/releases/latest/download/GHelper.zip) From 18a0c4c801c96500a25ef9d8c699948e9e19b704 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 16 Mar 2024 13:24:19 +0100 Subject: [PATCH 5/6] Slash lightning tweaks --- app/AnimeMatrix/AniMatrixControl.cs | 11 +++++++++-- app/AnimeMatrix/SlashDevice.cs | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/AnimeMatrix/AniMatrixControl.cs b/app/AnimeMatrix/AniMatrixControl.cs index e6c93490..40c418e1 100644 --- a/app/AnimeMatrix/AniMatrixControl.cs +++ b/app/AnimeMatrix/AniMatrixControl.cs @@ -19,6 +19,7 @@ namespace GHelper.AnimeMatrix public SlashDevice? deviceSlash; public static bool lidClose = false; + private static bool _wakeUp = false; double[]? AudioValues; WasapiCapture? AudioDevice; @@ -91,15 +92,21 @@ namespace GHelper.AnimeMatrix return; } - if (wakeUp) deviceSlash.WakeUp(); + if (wakeUp) _wakeUp = true; if (brightness == 0 || (auto && SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online) || (lid && lidClose)) { - //deviceSlash.Init(); + deviceSlash.Init(); deviceSlash.SetOptions(false, 0, 0); } else { + if (_wakeUp) + { + deviceSlash.WakeUp(); + _wakeUp = false; + } + deviceSlash.Init(); deviceSlash.SetMode((SlashMode)running); deviceSlash.SetOptions(true, brightness, inteval); diff --git a/app/AnimeMatrix/SlashDevice.cs b/app/AnimeMatrix/SlashDevice.cs index bcc9216d..4f4c0c38 100644 --- a/app/AnimeMatrix/SlashDevice.cs +++ b/app/AnimeMatrix/SlashDevice.cs @@ -84,18 +84,18 @@ namespace GHelper.AnimeMatrix public void WakeUp() { - Set(Packet(Encoding.ASCII.GetBytes("ASUS Tech.Inc."))); + Set(Packet(Encoding.ASCII.GetBytes("ASUS Tech.Inc.")), "SlashWakeUp"); } public void Init() { - Set(Packet(0xD7, 0x00, 0x00, 0x01, 0xAC)); - Set(Packet(0xD2, 0x02, 0x01, 0x08, 0xAB)); + Set(Packet(0xD7, 0x00, 0x00, 0x01, 0xAC), "SlashInit"); + Set(Packet(0xD2, 0x02, 0x01, 0x08, 0xAB), "SlashInit"); } public void Save() { - Set(Packet(0xD4, 0x00, 0x00, 0x01, 0xAB)); + Set(Packet(0xD4, 0x00, 0x00, 0x01, 0xAB), "SlashSave"); } public void SetMode(SlashMode mode) @@ -111,20 +111,20 @@ namespace GHelper.AnimeMatrix modeByte = 0x00; } - Set(Packet(0xD2, 0x03, 0x00, 0x0C)); - Set(Packet(0xD3, 0x04, 0x00, 0x0C, 0x01, modeByte, 0x02, 0x19, 0x03, 0x13, 0x04, 0x11, 0x05, 0x12, 0x06, 0x13)); + Set(Packet(0xD2, 0x03, 0x00, 0x0C), "SlashMode"); + Set(Packet(0xD3, 0x04, 0x00, 0x0C, 0x01, modeByte, 0x02, 0x19, 0x03, 0x13, 0x04, 0x11, 0x05, 0x12, 0x06, 0x13), "SlashMode"); } public void SetOptions(bool status, int brightness = 0, int interval = 0) { byte brightnessByte = (byte)(brightness * 85.333); - Set(Packet(0xD3, 0x03, 0x01, 0x08, 0xAB, 0xFF, 0x01, status ? (byte)0x01 : (byte)0x00, 0x06, brightnessByte, 0xFF, (byte)interval)); + Set(Packet(0xD3, 0x03, 0x01, 0x08, 0xAB, 0xFF, 0x01, status ? (byte)0x01 : (byte)0x00, 0x06, brightnessByte, 0xFF, (byte)interval), "SlashOptions"); } public void SetBatterySaver(bool status) { - Set(Packet(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00)); + Set(Packet(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00), "SlashBatterySaver"); } public void SetLidMode(bool status) @@ -132,10 +132,10 @@ namespace GHelper.AnimeMatrix Set(Packet(0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00)); } - public void Set(Packet packet) + public void Set(Packet packet, string? log = null) { _usbProvider?.Set(packet.Data); - Logger.WriteLine("Slash:" + BitConverter.ToString(packet.Data)); + if (log is not null) Logger.WriteLine("Slash:" + BitConverter.ToString(packet.Data)); } From fb00b7ccec288865e98133d8150f1ee274832603 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sat, 16 Mar 2024 17:48:46 +0100 Subject: [PATCH 6/6] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index fdf5f46c..00b3a408 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,7 +4,7 @@ [![Github all releases](https://img.shields.io/github/downloads/seerge/g-helper/total)](https://GitHub.com/seerge/g-helper/releases/) [![GitHub stars](https://img.shields.io/github/stars/seerge/g-helper.svg?style=social)](https://GitHub.com/seerge/g-helper/stargazers/) Small and lightweight Armoury Crate alternative for Asus laptops offering almost same functionality without extra load and unnecessary services. -Works with all popular models, such as ROG Zephyrus G14, G15, G16, M16, Flow X13, Flow X16, Flow Z13, TUF Series, Strix / Scar Series, ProArt, VivoBook, Ally and many more! +Works with all popular models, such as ROG Zephyrus G14, G15, G16, M16, Flow X13, Flow X16, Flow Z13, TUF Series, Strix / Scar Series, ProArt, Vivobook, Zenbook, ROG Ally and many more! # [:floppy_disk:Download](https://github.com/seerge/g-helper/releases/latest/download/GHelper.zip)