From 428b624ec6ae95015f2f564a015269e41c5fc52d Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:48:24 +0100
Subject: [PATCH 1/8] Anime Matrix hibernate wake-up tweak
---
app/AppConfig.cs | 16 ++++++++++++++++
app/AsusACPI.cs | 6 +++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index 9c68b277..f9b7fa28 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -465,6 +465,22 @@ public static class AppConfig
}
}
+ public static bool IsSwappedFans()
+ {
+ if (!ContainsModel("GA503")) return false;
+ if (Modes.GetCurrent() != 0) return false;
+
+ try
+ {
+ var (bios, model) = GetBiosAndModel();
+ return (Int32.Parse(bios) == 317);
+ }
+ catch
+ {
+ return false;
+ }
+ }
+
public static bool IsFanRequired()
{
return ContainsModel("GA402X") || ContainsModel("G513") || ContainsModel("G713R") || ContainsModel("G713P");
diff --git a/app/AsusACPI.cs b/app/AsusACPI.cs
index 7430cb6e..36df33eb 100644
--- a/app/AsusACPI.cs
+++ b/app/AsusACPI.cs
@@ -477,7 +477,11 @@ public class AsusACPI
if (fanScale != 100 && device == AsusFan.CPU) Logger.WriteLine("Custom fan scale: " + fanScale);
- // it seems to be a bug, when some old model's bios can go nuts if fan is set to 100%
+ if (AppConfig.IsSwappedFans())
+ {
+ device = (device == AsusFan.CPU) ? AsusFan.GPU : AsusFan.CPU;
+ Logger.WriteLine("Swapped fan fix");
+ }
for (int i = 8; i < curve.Length; i++) curve[i] = (byte)(Math.Max((byte)0, Math.Min((byte)100, curve[i])) * fanScale / 100);
From 6bab2fc9cbda2bffac56efa295d574aa4343fbaa Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:49:09 +0100
Subject: [PATCH 2/8] Anime Matrix hibernate wake-up tweaks
---
app/AnimeMatrix/AniMatrixControl.cs | 2 +-
app/AnimeMatrix/Communication/Platform/WindowsUsbProvider.cs | 3 +++
app/UI/RForm.cs | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/AnimeMatrix/AniMatrixControl.cs b/app/AnimeMatrix/AniMatrixControl.cs
index bce848ce..f433a8bc 100644
--- a/app/AnimeMatrix/AniMatrixControl.cs
+++ b/app/AnimeMatrix/AniMatrixControl.cs
@@ -80,7 +80,7 @@ namespace GHelper.AnimeMatrix
return;
}
- if (wakeUp && AppConfig.ContainsModel("401")) device.WakeUp();
+ if (wakeUp) device.WakeUp();
if (brightness == 0 || (auto && SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online))
{
diff --git a/app/AnimeMatrix/Communication/Platform/WindowsUsbProvider.cs b/app/AnimeMatrix/Communication/Platform/WindowsUsbProvider.cs
index 1a8630fa..2db6e1d8 100644
--- a/app/AnimeMatrix/Communication/Platform/WindowsUsbProvider.cs
+++ b/app/AnimeMatrix/Communication/Platform/WindowsUsbProvider.cs
@@ -37,6 +37,9 @@ namespace GHelper.AnimeMatrix.Communication.Platform
HidDevice = DeviceList.Local
.GetHidDevices(vendorId, productId)
.First(x => x.GetMaxFeatureReportLength() == maxFeatureReportLength);
+
+ Logger.WriteLine("Matrix Device: " + HidDevice.DevicePath);
+
}
catch
{
diff --git a/app/UI/RForm.cs b/app/UI/RForm.cs
index 2f203e01..3c66f7a4 100644
--- a/app/UI/RForm.cs
+++ b/app/UI/RForm.cs
@@ -34,6 +34,7 @@ namespace GHelper.UI
{
var parms = base.CreateParams;
parms.Style &= ~0x02000000; // Turn off WS_CLIPCHILDREN
+ parms.ClassStyle &= ~0x00020000;
return parms;
}
}
From 71b74801bac160f4924e4b58d3209f55b708bff8 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 20:10:00 +0100
Subject: [PATCH 3/8] New translations strings.resx (Spanish) (#2047)
---
app/Properties/Strings.es.resx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/Properties/Strings.es.resx b/app/Properties/Strings.es.resx
index 3158fb4e..1a035d4b 100644
--- a/app/Properties/Strings.es.resx
+++ b/app/Properties/Strings.es.resx
@@ -145,7 +145,7 @@
¿Reiniciar ahora?
- Ally Controller
+ Mando Ally
Velocidad
@@ -274,13 +274,13 @@
Cargar una vez al 100%
- Binding
+ Emparejado
- Primary
+ Primario
- Secondary
+ Secundario
Actualizaciones de BIOS y Drivers
@@ -310,10 +310,10 @@
Color
- Contrast
+ Contraste
- Controller
+ Mando
CPU Boost
@@ -328,7 +328,7 @@
Por defecto
- Disable Controller
+ Deshabilitar mando
Desactivar Overdrive
@@ -349,7 +349,7 @@
Eco
- Enable GPU on shutdown (prevents issue with Eco mode)
+ Habilitar GPU al apagar (evita problemas con el modo Eco)
Deshabilitar la dGPU cambiando a modo Eco mientras el Modo de Pantalla en el Panel de Control de NVIDIA no está configurado en Optimus puede causar problemas con el control del brillo hasta después del próximo reinicio.
From df5bcbc376152ee8200173a1008a9f583e9a743e Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:21:09 +0100
Subject: [PATCH 4/8] New translations strings.resx (Spanish) (#2048)
---
app/Properties/Strings.es.resx | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/Properties/Strings.es.resx b/app/Properties/Strings.es.resx
index 1a035d4b..65f47496 100644
--- a/app/Properties/Strings.es.resx
+++ b/app/Properties/Strings.es.resx
@@ -363,7 +363,7 @@
Ajustes de energía
- Export Profile
+ Exportar perfil
Adicional
@@ -438,10 +438,10 @@
Alto
- Image Rotation
+ Rotación de imagen
- Import Profile
+ Importar perfil
Atajos de teclado
@@ -477,10 +477,10 @@
Bajo
- Left Stick Deadzones
+ Punto muerto stick izquierdo
- Left Trigger Deadzones
+ Punto muerto gatillo izquierdo
Visualizador de audio
@@ -531,7 +531,7 @@
Respuesta del botón
- Import failed. Selected file is not a valid mouse profile or corrutpted.
+ Importación fallida. El archivo seleccionado no es un perfil válido o está corrupto.
Distancia de despegue (LOD)
@@ -618,7 +618,7 @@
Quitar
- Reset
+ Reiniciar
Algo está usando la dGPU e impide el modo Eco. ¿Reiniciar dGPU en el administrador de dispositivos? (Proceda bajo su propio riesgo)
@@ -627,16 +627,16 @@
RPM
- Right Stick Deadzones
+ Punto muerto stick derecho
- Right Trigger Deadzones
+ Punto muerto gatillo derecho
Ejecutar al inicio
- Scaling Quality
+ Calidad del escalado
Bajar brillo ScreenPad
@@ -717,7 +717,7 @@
Versión
- Vibration Strength
+ Intensidad de vibración
Bajar volumen
From 9b33a43b49f22f579a24371a2ad995412556a403 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:52:03 +0100
Subject: [PATCH 5/8] Swapped fans workaround for GA503.317
---
app/AppConfig.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index f9b7fa28..8ee4409b 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -468,7 +468,6 @@ public static class AppConfig
public static bool IsSwappedFans()
{
if (!ContainsModel("GA503")) return false;
- if (Modes.GetCurrent() != 0) return false;
try
{
From d19ff265ab0ec6261e892979d022e976218a6cb7 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:52:56 +0100
Subject: [PATCH 6/8] Version bump
---
app/GHelper.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/GHelper.csproj b/app/GHelper.csproj
index 212fa396..a390d6e6 100644
--- a/app/GHelper.csproj
+++ b/app/GHelper.csproj
@@ -15,7 +15,7 @@
AnyCPU
False
True
- 0.152
+ 0.153
From 103c65a43d2aa51591982f65be441801d2a6b024 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 9 Feb 2024 22:15:25 +0100
Subject: [PATCH 7/8] Custom fan curves fix for GA503.317
https://github.com/seerge/g-helper/issues/2049
---
app/AppConfig.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index 8ee4409b..bb148661 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -467,7 +467,7 @@ public static class AppConfig
public static bool IsSwappedFans()
{
- if (!ContainsModel("GA503")) return false;
+ if (!ContainsModel("GA503R")) return false;
try
{
From b6dbc1ed251ba5c14232394933dc82bb5604c542 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Sat, 10 Feb 2024 12:43:11 +0100
Subject: [PATCH 8/8] New Crowdin updates (#2050)
* New translations strings.resx (French)
* New translations strings.resx (French)
---
app/Properties/Strings.fr.resx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/Properties/Strings.fr.resx b/app/Properties/Strings.fr.resx
index c5e50613..44970cb0 100644
--- a/app/Properties/Strings.fr.resx
+++ b/app/Properties/Strings.fr.resx
@@ -199,7 +199,7 @@
Rapide
- Mode d’Éclairage
+ Effets d'éclairage
Normal
@@ -235,7 +235,7 @@
Molette
- Underglow
+ Led ROG
Appliquer automatiquement
@@ -363,7 +363,7 @@ Voulez-vous continuer ?
Paramètres d'énergie
- Exporter un profil
+ Exporter profil
+ d'options
@@ -441,7 +441,7 @@ Voulez-vous continuer ?
Rotation de l'image
- Importer un profil
+ Importer profil
Raccourcis clavier
@@ -522,7 +522,7 @@ Voulez-vous continuer ?
Minutes
- Angle Snapping
+ Correction d'angle
Arrêt automatique après
@@ -534,7 +534,7 @@ Voulez-vous continuer ?
Échec de l'importation. Le fichier sélectionné n'est pas un profil de souris valide ou corrompu.
- Lift Off Distance
+ Hauteur de détection
Avertissement de batterie faible à