Merge branch 'main' of https://github.com/seerge/g-helper

2026-02-23 13:00:52 +01:00 · 2024-03-18 17:53:13 +01:00
parent d005b59b2e fb00b7ccec
commit a3e1286296
6 changed files with 44 additions and 29 deletions
--- 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);
--- a/app/AnimeMatrix/SlashDevice.cs
+++ b/app/AnimeMatrix/SlashDevice.cs
@@ -84,18 +84,18 @@ namespace GHelper.AnimeMatrix

        public void WakeUp()
        {
-            Set(Packet<SlashPacket>(Encoding.ASCII.GetBytes("ASUS Tech.Inc.")));
+            Set(Packet<SlashPacket>(Encoding.ASCII.GetBytes("ASUS Tech.Inc.")), "SlashWakeUp");
        }

        public void Init()
        {
-            Set(Packet<SlashPacket>(0xD7, 0x00, 0x00, 0x01, 0xAC));
-            Set(Packet<SlashPacket>(0xD2, 0x02, 0x01, 0x08, 0xAB));
+            Set(Packet<SlashPacket>(0xD7, 0x00, 0x00, 0x01, 0xAC), "SlashInit");
+            Set(Packet<SlashPacket>(0xD2, 0x02, 0x01, 0x08, 0xAB), "SlashInit");
        }

        public void Save()
        {
-            Set(Packet<SlashPacket>(0xD4, 0x00, 0x00, 0x01, 0xAB));
+            Set(Packet<SlashPacket>(0xD4, 0x00, 0x00, 0x01, 0xAB), "SlashSave");
        }

        public void SetMode(SlashMode mode)
@@ -111,20 +111,20 @@ namespace GHelper.AnimeMatrix
                modeByte = 0x00;
            }

-            Set(Packet<SlashPacket>(0xD2, 0x03, 0x00, 0x0C));
-            Set(Packet<SlashPacket>(0xD3, 0x04, 0x00, 0x0C, 0x01, modeByte, 0x02, 0x19, 0x03, 0x13, 0x04, 0x11, 0x05, 0x12, 0x06, 0x13));
+            Set(Packet<SlashPacket>(0xD2, 0x03, 0x00, 0x0C), "SlashMode");
+            Set(Packet<SlashPacket>(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<SlashPacket>(0xD3, 0x03, 0x01, 0x08, 0xAB, 0xFF, 0x01, status ? (byte)0x01 : (byte)0x00, 0x06, brightnessByte, 0xFF, (byte)interval));
+            Set(Packet<SlashPacket>(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<SlashPacket>(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00));
+            Set(Packet<SlashPacket>(0xD8, 0x01, 0x00, 0x01, status ? (byte)0x80 : (byte)0x00), "SlashBatterySaver");
        }

        public void SetLidMode(bool status)
@@ -132,10 +132,10 @@ namespace GHelper.AnimeMatrix
            Set(Packet<SlashPacket>(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));
        }


--- 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");
    }

+
+
 }
--- a/app/Extra.cs
+++ b/app/Extra.cs
@@ -205,15 +205,16 @@ 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;
            }

+            if (AppConfig.IsNoFNV())
+            {
+                labelFNV.Visible = comboFNV.Visible = textFNV.Visible = false;
+            }
+
            if (Program.acpi.DeviceGet(AsusACPI.GPUEco) < 0)
            {
                checkGpuApps.Visible = false;
--- a/app/Properties/Strings.es.resx
+++ b/app/Properties/Strings.es.resx
@@ -250,16 +250,16 @@
    <value>Encendida</value>
  </data>
  <data name="BacklightLow" xml:space="preserve">
-    <value>Low</value>
+    <value>Bajo</value>
  </data>
  <data name="BacklightMax" xml:space="preserve">
-    <value>Max</value>
+    <value>Máximo</value>
  </data>
  <data name="BacklightMid" xml:space="preserve">
-    <value>Mid</value>
+    <value>Medio</value>
  </data>
  <data name="BacklightOff" xml:space="preserve">
-    <value>Off</value>
+    <value>Apagado</value>
  </data>
  <data name="BacklightTimeout" xml:space="preserve">
    <value>Tiempo de espera conectado / con batería (0 - ON)</value>
@@ -355,7 +355,7 @@
    <value>Descargando</value>
  </data>
  <data name="DownloadColorProfiles" xml:space="preserve">
-    <value>Download Color Profiles</value>
+    <value>Descargar perfiles de color</value>
  </data>
  <data name="DownloadUpdate" xml:space="preserve">
    <value>Descargar</value>
@@ -585,7 +585,7 @@
    <value>Multizona fuerte</value>
  </data>
  <data name="Muted" xml:space="preserve">
-    <value>Muted</value>
+    <value>Silenciado</value>
  </data>
  <data name="MuteMic" xml:space="preserve">
    <value>Silenciar micrófono</value>
@@ -603,10 +603,10 @@
    <value>No conectado</value>
  </data>
  <data name="Off" xml:space="preserve">
-    <value>Off</value>
+    <value>Apagado</value>
  </data>
  <data name="On" xml:space="preserve">
-    <value>On</value>
+    <value>Encendido</value>
  </data>
  <data name="OneZone" xml:space="preserve">
    <value>Una zona</value>
@@ -753,7 +753,7 @@
    <value>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.</value>
  </data>
  <data name="Unmuted" xml:space="preserve">
-    <value>Unmuted</value>
+    <value>No silenciado</value>
  </data>
  <data name="Updates" xml:space="preserve">
    <value>Actualización</value>
@@ -765,7 +765,7 @@
    <value>Intensidad de vibración</value>
  </data>
  <data name="VisualMode" xml:space="preserve">
-    <value>Visual Mode</value>
+    <value>Modo visual</value>
  </data>
  <data name="VolumeDown" xml:space="preserve">
    <value>Bajar volumen</value>