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

* Support for Strix Carry (P508)

* Fixes polling rate, angle snapping and debounce for Gladius II Origin.

* The Gen2 version of the TuF M3 uses 0-100 for brightness.

* Adds support for ROG Strix Impact III (P518)

* Import/Export feature for mice.

* Suppor for Strix Impact (P303)

* Support for Strix Impact II Electro Punk

* Strix Carry has 50 DPI minimum and increments of 50.

* Respect top-most setting of GHelper

* Fixes to the buttons to be wider to fit longer translations.

* Basic support for the Galdius III EVA02

* Gladius wireless and wired PIDs were switched

* Add support for the chinese variant of the M4 Wireless, the P310

* Apparently there is another Gladius III that is not wireless at all. Renaming the wireless to make it a little less confusing.

* Adds Support for Galdius III (wired) P514

* Support for P504 Glaidus II PKN

* Support for the ROG Keris wired mouse P509

* Fixed support for TUF M3 Gen II

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          7.0.x
+          8.0.x
     - name: Build
       run: |
         dotnet build app/GHelper.sln

.github/workflows/release.yml

@@ -18,13 +18,13 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          7.0.x
+          8.0.x
     - name: Publish
       run: |
         dotnet publish app/GHelper.sln --configuration Release --runtime win-x64 -p:PublishSingleFile=true --no-self-contained
-        powershell Compress-Archive app/bin/x64/Release/net7.0-windows/win-x64/publish/GHelper.exe GHelper.zip
+        powershell Compress-Archive app/bin/x64/Release/net8.0-windows/win-x64/publish/GHelper.exe GHelper.zip
     - name: Upload
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
-        gh release upload ${{ github.ref_name }} app/bin/x64/Release/net7.0-windows/win-x64/publish/GHelper.exe GHelper.zip
+        gh release upload ${{ github.ref_name }} app/bin/x64/Release/net8.0-windows/win-x64/publish/GHelper.exe GHelper.zip

app/AppConfig.cs

@@ -417,7 +417,7 @@ public static class AppConfig
 
     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") || ContainsModel("M140") || ContainsModel("UM340") || ContainsModel("S540");
+        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") || ContainsModel("S540") || ContainsModel("M7400");
     }
 
     public static bool IsNoOverdrive()

app/Extra.Designer.cs

@@ -791,30 +791,35 @@ namespace GHelper
             tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
             tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
             tableBacklight.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25F));
-            tableBacklight.Controls.Add(checkBatteryLogo, 0, 5);
+
-            tableBacklight.Controls.Add(checkBattery, 0, 5);
-            tableBacklight.Controls.Add(checkBatteryLid, 0, 5);
-            tableBacklight.Controls.Add(checkBatteryBar, 0, 5);
             tableBacklight.Controls.Add(labelBacklightKeyboard, 0, 0);
             tableBacklight.Controls.Add(checkAwake, 0, 1);
             tableBacklight.Controls.Add(checkBoot, 0, 2);
             tableBacklight.Controls.Add(checkSleep, 0, 3);
             tableBacklight.Controls.Add(checkShutdown, 0, 4);
+            tableBacklight.Controls.Add(checkBattery, 0, 5);
+
             tableBacklight.Controls.Add(labelBacklightLogo, 1, 0);
             tableBacklight.Controls.Add(checkAwakeLogo, 1, 1);
             tableBacklight.Controls.Add(checkBootLogo, 1, 2);
             tableBacklight.Controls.Add(checkSleepLogo, 1, 3);
             tableBacklight.Controls.Add(checkShutdownLogo, 1, 4);
+            tableBacklight.Controls.Add(checkBatteryLogo, 1, 5);
+
             tableBacklight.Controls.Add(labelBacklightBar, 2, 0);
             tableBacklight.Controls.Add(checkAwakeBar, 2, 1);
             tableBacklight.Controls.Add(checkBootBar, 2, 2);
             tableBacklight.Controls.Add(checkSleepBar, 2, 3);
             tableBacklight.Controls.Add(checkShutdownBar, 2, 4);
+            tableBacklight.Controls.Add(checkBatteryBar, 2, 5);
+
             tableBacklight.Controls.Add(labelBacklightLid, 3, 0);
             tableBacklight.Controls.Add(checkAwakeLid, 3, 1);
             tableBacklight.Controls.Add(checkBootLid, 3, 2);
             tableBacklight.Controls.Add(checkSleepLid, 3, 3);
             tableBacklight.Controls.Add(checkShutdownLid, 3, 4);
+            tableBacklight.Controls.Add(checkBatteryLid, 3, 5);
+
             tableBacklight.Dock = DockStyle.Top;
             tableBacklight.Location = new Point(0, 5);
             tableBacklight.Margin = new Padding(0);

app/GHelper.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>True</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -15,7 +15,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.177</AssemblyVersion>
+    <AssemblyVersion>0.179</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

app/Peripherals/Mouse/Models/TUFM3.cs

@@ -130,5 +130,40 @@
             return 100;
         }
 
+        public override int MaxDPI()
+        {
+            return 8_000;
+        }
+
+        public override int MinDPI()
+        {
+            return 100;
+        }
+
+        public override int DPIIncrements()
+        {
+            return 50;
+        }
+
+        public override bool HasDPIColors()
+        {
+            return true;
+        }
+
+        protected override int ParseDPIProfile(byte[] packet)
+        {
+            return base.ParseDPIProfile(packet) + 1;
+        }
+
+        protected override byte[] GetChangeDPIProfilePacket(int profile)
+        {
+            return new byte[] { reportId, 0x51, 0x31, 0x0A, 0x00, 0x04 };
+        }
+
+        protected override byte[] GetChangeDPIProfilePacket2(int profile)
+        {
+            return new byte[] { reportId, 0x51, 0x31, 0x09, 0x00, (byte)(profile - 1) };
+        }
+
     }
 }

app/Program.cs

@@ -208,10 +208,10 @@ namespace GHelper
 
 
 
-        public static void SetAutoModes(bool powerChanged = false, bool init = false)
+        public static bool SetAutoModes(bool powerChanged = false, bool init = false)
         {
 
-            if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastAuto) < 3000) return;
+            if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastAuto) < 3000) return false;
             lastAuto = DateTimeOffset.Now.ToUnixTimeMilliseconds();
 
             isPlugged = SystemInformation.PowerStatus.PowerLineStatus;
@@ -240,6 +240,8 @@ namespace GHelper
             {
                 settingsForm.AutoKeyboard();
             }
+
+            return true;
         }
 
         private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)

app/Settings.cs

@@ -674,7 +674,7 @@ namespace GHelper
                             break;
                         case 1:
                             Logger.WriteLine("Monitor Power On");
-                            Program.SetAutoModes();
+                            if (!Program.SetAutoModes()) BatteryControl.AutoBattery();
                             break;
                         case 2:
                             Logger.WriteLine("Monitor Dimmed");

app/global.json

@@ -1,5 +1,2 @@
 {
-  "sdk": {
-    "version": "7.0.406"
-  }
 }

docs/README.md

@@ -7,6 +7,7 @@ Small and lightweight Armoury Crate alternative for Asus laptops offering almost
 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)
+**⭐ If you like the app - please spread the word about it online**
 
 <table>
 <tr>
@@ -103,6 +104,7 @@ Each BIOS mode is paired with matching Windows Power Mode. You can adjust this s
 - ROG Chakram X (P708)
 - ROG Chakram Core (P511)
 - ROG Gladius II and Gladius II Origin (P502 and P504)
+- ROG Gladius II Wireless
 - ROG Gladius III
 - ROG Gladius III Wireless
 - ROG Harpe Ace Aim Lab Edition
@@ -116,6 +118,7 @@ Each BIOS mode is paired with matching Windows Power Mode. You can adjust this s
 - TUF Gaming M4 Wireless (P306)
 - TUF Gaming M3
 - TUF Gaming M3 Gen II
+- TUF Gaming M4 AIR
 
 Huge thanks to [@IceStormNG](https://github.com/IceStormNG) 👑 for contribution and research (!).
 
@@ -169,6 +172,6 @@ The role of G-Helper for your laptop is similar to the role of a remote control
 - [AsusCtl](https://gitlab.com/asus-linux/asusctl) for inspiration and some reverse engineering
 
 ### Disclaimers
-"ROG", "TUF", and "Armoury Crate" are trademarked by and belong to AsusTek Computer, Inc. I make no claims to these or any assets belonging to AsusTek Computer and use them purely for informational purposes only.
+"Asus", "ROG", "TUF", and "Armoury Crate" are trademarked by and belong to AsusTek Computer, Inc. I make no claims to these or any assets belonging to AsusTek Computer and use them purely for informational purposes only.
 
 THE SOFTWARE IS PROVIDED “AS IS” AND WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MISUSE OF THIS SOFTWARE COULD CAUSE SYSTEM INSTABILITY OR MALFUNCTION.