Unsupported charge limits for GU605

* 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

.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: https://www.paypal.com/donate/?hosted_button_id=4HMSHS4EBQWTA

app/AppConfig.cs

@@ -109,7 +109,8 @@ public static class AppConfig
                         break;
                     }
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 Logger.WriteLine(ex.Message);
             }
@@ -625,6 +626,15 @@ public static class AppConfig
         return IsAlly() || Is("stop_ac");
     }
 
+    public static bool IsChargeLimit80()
+    {
+        return ContainsModel("GA403");
+    }
 
+    public static bool IsChargeLimit6080()
+    {
+        return ContainsModel("GU605") || (IsTUF() && !(ContainsModel("FX507Z") || ContainsModel("FA617")));
+
+    }
 
 }

app/Battery/BatteryControl.cs

@@ -1,5 +1,4 @@
-using GHelper.Helpers;
-using System.Diagnostics;
+using System.Diagnostics;
 
 namespace GHelper.Battery
 {
@@ -37,6 +36,17 @@ namespace GHelper.Battery
             if (limit < 0) limit = AppConfig.Get("charge_limit");
             if (limit < 40 || limit > 100) return;
 
+            if (AppConfig.IsChargeLimit80())
+            {
+                limit = (limit <= 80) ? 80 : 100;
+            }
+
+            if (AppConfig.IsChargeLimit6080())
+            {
+                if (limit > 80) limit = 100;
+                else if (limit < 60) limit = 60;
+            }
+
             Program.acpi.DeviceSet(AsusACPI.BatteryLimit, limit, "BatteryLimit");
 
             AppConfig.Set("charge_limit", limit);

app/Fans.cs

@@ -1160,8 +1160,11 @@ namespace GHelper
                 trackGPUBoost.Value = AsusACPI.MaxGPUBoost;
                 trackGPUTemp.Value = AsusACPI.MaxGPUTemp;
 
-                AppConfig.SetMode("gpu_boost", trackGPUBoost.Value);
-                AppConfig.SetMode("gpu_temp", trackGPUTemp.Value);
+                //AppConfig.SetMode("gpu_boost", trackGPUBoost.Value);
+                //AppConfig.SetMode("gpu_temp", trackGPUTemp.Value);
+                
+                AppConfig.RemoveMode("gpu_boost");
+                AppConfig.RemoveMode("gpu_temp");
 
                 AppConfig.RemoveMode("gpu_power");
                 AppConfig.RemoveMode("gpu_clock_limit");

app/GHelper.csproj

@@ -15,7 +15,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.173</AssemblyVersion>
+    <AssemblyVersion>0.174</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

app/Helpers/ToastForm.cs

@@ -73,6 +73,8 @@ namespace GHelper.Helpers
         protected override void PerformPaint(PaintEventArgs e)
         {
             Brush brush = new SolidBrush(Color.FromArgb(150, Color.Black));
+
+            e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
             e.Graphics.FillRoundedRectangle(brush, Bound, 10);
 
             StringFormat format = new StringFormat();

app/Peripherals/Mouse/Models/GladiusII.cs

@@ -297,4 +297,166 @@
             return 3;
         }
     }
+
+    //P504
+    public class GladiusIIOriginPink : GladiusIIOrigin
+    {
+        public GladiusIIOriginPink() : base(0x18CD, "mi_02")
+        {
+
+        }
+        public override string GetDisplayName()
+        {
+            return "Gladius II PNK LTD";
+        }
+        public override int ProfileCount()
+        {
+            return 3;
+        }
+
+        public override LightingZone[] SupportedLightingZones()
+        {
+            return new LightingZone[] { LightingZone.Scrollwheel, LightingZone.Underglow };
+        }
+
+        protected override byte[] GetUpdateLightingModePacket(LightingSetting lightingSetting, LightingZone zone)
+        {
+            /*
+             * This mouse uses different speed values for rainbow mode compared to others.
+             * 51 28 03 00 03 04 FF 00 00 00 00 [8C] 00 00 00 00
+             * 51 28 03 00 03 04 FF 00 00 00 00 [64] 00 00 00 00
+             * 51 28 03 00 03 04 FF 00 00 00 00 [3F] 00 00 00 00
+             */
+
+            byte speed = (byte)(SupportsAnimationSpeed(lightingSetting.LightingMode) ? lightingSetting.AnimationSpeed : 0x00);
+
+            if (lightingSetting.LightingMode == LightingMode.Rainbow)
+            {
+                speed = 0x64;
+
+                switch (lightingSetting.AnimationSpeed)
+                {
+                    case AnimationSpeed.Slow:
+                        speed = 0x8C;
+                        break;
+                    case AnimationSpeed.Medium:
+                        speed = 0x64;
+                        break;
+                    case AnimationSpeed.Fast:
+                        speed = 0x3F;
+                        break;
+                }
+            }
+
+
+
+            return new byte[] { reportId, 0x51, 0x28, (byte)zone, 0x00,
+                IndexForLightingMode(lightingSetting.LightingMode),
+                (byte)lightingSetting.Brightness,
+                0x00, // this mouse has 2 colors per LED capability, but we do not suppor this yet, so we disable it
+                lightingSetting.RGBColor.R, lightingSetting.RGBColor.G, lightingSetting.RGBColor.B,
+                0x00, 0x00, 0x00, //this would be the second set of RGB Colors if we ever support this
+                (byte)(SupportsAnimationDirection(lightingSetting.LightingMode) ? lightingSetting.AnimationDirection : 0x00),
+                (byte)((lightingSetting.RandomColor && SupportsRandomColor(lightingSetting.LightingMode)) ? 0x01: 0x00),
+                speed
+            };
+        }
+
+        protected LightingSetting? ParseLightingSetting(byte[] packet, LightingZone zone)
+        {
+            if (packet[1] != 0x12 || packet[2] != 0x03)
+            {
+                return null;
+            }
+
+            //skip first block as it seems to be empty. Maybe only filled to certain configurations.
+            int offset = 5 + 9 + (((int)zone) * 9);
+
+            LightingSetting setting = new LightingSetting();
+
+            setting.LightingMode = LightingModeForIndex(packet[offset + 0]);
+            setting.Brightness = packet[offset + 1];
+            //Offset 2 is a bool that says whether dual color RGB is in use. Unsupported for now by GHelper
+
+            setting.RGBColor = Color.FromArgb(packet[offset + 3], packet[offset + 4], packet[offset + 5]);
+
+            //Offset 7 - 9 are the second RGB colors, unuse as not supported yet
+
+
+            return setting;
+        }
+
+        public override void ReadLightingSetting()
+        {
+            if (!HasRGB())
+            {
+                return;
+            }
+            //Mouse sends all lighting zones in one response                                                         Direction, Random col, Speed
+            //First block seems emtpy?
+            //00 12 03 00 00 [00 00 00 00 00 00 00 00 00] [03 04 01 00 00 00 00 00 00] [03 04 01 00 00 00 00 00 00] [00 01 8c]
+            //Length 9, offset 5
+            //Direction
+            byte[]? response = WriteForResponse(GetReadLightingModePacket(LightingZone.All));
+            if (response is null) return;
+
+            LightingZone[] lz = SupportedLightingZones();
+            for (int i = 0; i < lz.Length; ++i)
+            {
+                LightingSetting? ls = ParseLightingSetting(response, lz[i]);
+                if (ls is null)
+                {
+                    Logger.WriteLine(GetDisplayName() + ": Failed to read RGB Setting for Zone " + lz[i].ToString());
+                    continue;
+                }
+                ls.AnimationDirection = SupportsAnimationDirection(ls.LightingMode)
+                   ? (AnimationDirection)response[32]
+                   : AnimationDirection.Clockwise;
+
+                ls.RandomColor = SupportsRandomColor(ls.LightingMode) && response[33] == 0x01;
+
+                //Rainbow uses different speed values for whatever reason
+                if (response[12] == 0x03)
+                {
+                    byte speed = response[34];
+
+                    switch (speed)
+                    {
+                        case 0x3F:
+                            ls.AnimationSpeed = AnimationSpeed.Fast;
+                            break;
+
+                        case 0x64:
+                            ls.AnimationSpeed = AnimationSpeed.Medium;
+                            break;
+
+                        case 0x8C:
+                            ls.AnimationSpeed = AnimationSpeed.Slow;
+                            break;
+
+                        default:
+                            ls.AnimationSpeed = AnimationSpeed.Medium;
+                            break;
+                    }
+                }
+                else
+                {
+                    ls.AnimationSpeed = SupportsAnimationSpeed(ls.LightingMode)
+                    ? (AnimationSpeed)response[34]
+                    : AnimationSpeed.Medium;
+
+                    if (ls.AnimationSpeed != AnimationSpeed.Fast
+                        && ls.AnimationSpeed != AnimationSpeed.Medium
+                        && ls.AnimationSpeed != AnimationSpeed.Slow)
+                    {
+                        ls.AnimationSpeed = AnimationSpeed.Medium;
+                    }
+                }
+
+
+                Logger.WriteLine(GetDisplayName() + ": Read RGB Setting for Zone " + lz[i].ToString() + ": " + ls.ToString());
+                LightingSetting[i] = ls;
+            }
+        }
+    }
 }

app/Peripherals/Mouse/Models/KerisWirelssAimpoint.cs

@@ -99,6 +99,18 @@
         {
             return true;
         }
+        // 3.00.06 - 4.00.01 or newer firmware
+        protected override PollingRate ParsePollingRate(byte[] packet)
+        {
+            if (packet[1] == 0x12 && packet[2] == 0x04 && packet[3] == 0x00)
+            {
+                if ((int)packet[13] > 7)
+                    return (PollingRate)packet[13] - 96;
+                return (PollingRate)packet[13];
+            }
+
+            return PollingRate.PR125Hz;
+        }
     }
 
     public class KerisWirelssAimpointWired : KerisWirelssAimpoint

app/Peripherals/Mouse/Models/ROGKerisWireless.cs

@@ -159,15 +159,31 @@
         }
     }
 
-    public class ROGKerisWirelessWiredC : ROGKerisWireless
+    //P509
+    public class ROGKeris : ROGKerisWireless
     {
-        public ROGKerisWirelessWiredC() : base(0x195C, false)
+        public ROGKeris() : base(0x195C, false)
         {
         }
 
         public override string GetDisplayName()
         {
-            return "ROG Keris (Wired)";
+            return "ROG Keris";
+        }
+
+        public override bool HasBattery()
+        {
+            return false;
+        }
+
+        public override bool HasLowBatteryWarning()
+        {
+            return false;
+        }
+
+        public override bool HasAutoPowerOff()
+        {
+            return false;
         }
     }
 

app/Peripherals/PeripheralsProvider.cs

@@ -188,10 +188,11 @@ namespace GHelper.Peripherals
             DetectMouse(new GladiusIIIAimpoint());
             DetectMouse(new GladiusIIIAimpointWired());
             DetectMouse(new GladiusIIOrigin());
+            DetectMouse(new GladiusIIOriginPink());
             DetectMouse(new GladiusII());
             DetectMouse(new ROGKerisWireless());
             DetectMouse(new ROGKerisWirelessWired());
-            DetectMouse(new ROGKerisWirelessWiredC());
+            DetectMouse(new ROGKeris());
             DetectMouse(new ROGKerisWirelessEvaEdition());
             DetectMouse(new ROGKerisWirelessEvaEditionWired());
             DetectMouse(new TUFM4Wirelss());

app/Properties/Strings.resx

@@ -624,7 +624,7 @@ Do you still want to continue?</value>
     <value>Optimized</value>
   </data>
   <data name="OptimizedGPUTooltip" xml:space="preserve">
-    <value>Switch to Eco on battery and to Standard when plugged</value>
+    <value>Switch to Eco on battery and to Standard when plugged in</value>
   </data>
   <data name="OptimizedUSBC" xml:space="preserve">
     <value>Keep GPU disabled on USB-C charger in Optimized mode</value>
@@ -800,4 +800,4 @@ Do you still want to continue?</value>
   <data name="Zoom" xml:space="preserve">
     <value>Zoom</value>
   </data>
-</root>
+</root>

app/Settings.cs

@@ -12,6 +12,7 @@ using GHelper.Peripherals;
 using GHelper.Peripherals.Mouse;
 using GHelper.UI;
 using GHelper.USB;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Timers;
 
@@ -224,6 +225,7 @@ namespace GHelper
 
             sliderBattery.MouseUp += SliderBattery_MouseUp;
             sliderBattery.KeyUp += SliderBattery_KeyUp;
+            sliderBattery.ValueChanged += SliderBattery_ValueChanged;
 
             Program.trayIcon.MouseMove += TrayIcon_MouseMove;
 
@@ -272,11 +274,17 @@ namespace GHelper
             InitVisual();
         }
 
+
         private void ButtonFHD_Click(object? sender, EventArgs e)
         {
             screenControl.ToogleFHD();
         }
 
+        private void SliderBattery_ValueChanged(object? sender, EventArgs e)
+        {
+            VisualiseBatteryTitle(sliderBattery.Value);
+        }
+
         private void SliderBattery_KeyUp(object? sender, KeyEventArgs e)
         {
             BatteryControl.SetBatteryChargeLimit(sliderBattery.Value);
@@ -1293,6 +1301,8 @@ namespace GHelper
             if (updatesForm != null && updatesForm.Text != "") updatesForm.Close();
             if (matrixForm != null && matrixForm.Text != "") matrixForm.Close();
             if (handheldForm != null && handheldForm.Text != "") handheldForm.Close();
+            if (mouseSettings != null && mouseSettings.Text != "") mouseSettings.Close();
+
         }
 
         /// <summary>
@@ -1710,9 +1720,14 @@ namespace GHelper
             but.BackColor = but.Enabled ? Color.FromArgb(255, but.BackColor) : Color.FromArgb(100, but.BackColor);
         }
 
-        public void VisualiseBattery(int limit)
+        public void VisualiseBatteryTitle(int limit)
         {
             labelBatteryTitle.Text = Properties.Strings.BatteryChargeLimit + ": " + limit.ToString() + "%";
+        }
+
+        public void VisualiseBattery(int limit)
+        {
+            VisualiseBatteryTitle(limit);
             sliderBattery.Value = limit;
 
             sliderBattery.AccessibleName = Properties.Strings.BatteryChargeLimit + ": " + limit.ToString() + "%";

docs/README.md

@@ -7,7 +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)
-### Support project : [:euro: Paypal EUR](https://www.paypal.com/donate/?hosted_button_id=4HMSHS4EBQWTA) | [💵 Paypal USD](https://www.paypal.com/donate/?hosted_button_id=SRM6QUX6ACXDY)
+### Support project : [:euro: Paypal EUR](https://bit.ly/4c0ZWs9) | [💵 Paypal USD](https://bit.ly/4aGTyW8)
 
 - [FAQ](https://github.com/seerge/g-helper/wiki/FAQ)
 - [Setup and Requirements](https://github.com/seerge/g-helper/wiki/Requirements)
@@ -23,8 +23,8 @@ Works with all popular models, such as ROG Zephyrus G14, G15, G16, M16, Flow X13
 | [Josh Cravey](https://www.youtube.com/watch?v=hqe-PjuE-K8) | [cbutters Tech](https://www.youtube.com/watch?v=6aVdwJKZSSc) | 
 
 ## 📰 Articles
-1. https://binaryfork.com/ghelper-armoury-crate-alternative-10216/
-2. https://www.digitaltrends.com/computing/g-helper-armoury-crate-alternative/
+1. https://www.digitaltrends.com/computing/g-helper-armoury-crate-alternative/
+2. https://binaryfork.com/ghelper-armoury-crate-alternative-10216/
 
 ## :gift: Advantages 
 
@@ -137,13 +137,6 @@ Huge thanks to [@IceStormNG](https://github.com/IceStormNG) 👑 for contributio
 - ``M + X`` - Screenshot
 - ``M + Right Stick Click`` - Controller Mode
 
-------------------
-#### If you like the app you can make a Donation 
-
-| [Paypal in EUR](https://www.paypal.com/donate/?hosted_button_id=4HMSHS4EBQWTA) | [Paypal in USD](https://www.paypal.com/donate/?hosted_button_id=SRM6QUX6ACXDY) |
-| ------------------------------------------ | ----------------------------------------------- |
-| [![QR Code](https://user-images.githubusercontent.com/5920850/233658717-0441494d-fede-4a2c-b4f2-4b16a184a69a.png)](https://www.paypal.com/donate/?hosted_button_id=4HMSHS4EBQWTA) | [![QR Code](https://github-production-user-asset-6210df.s3.amazonaws.com/5920850/239492811-b487e89a-3df6-42ea-bdb8-24c455ab2310.png)](https://www.paypal.com/donate/?hosted_button_id=SRM6QUX6ACXDY) |
-
 ------------------
 
 ### 🔖 Important Notice