From 574c6ccda12ddcc4607c6a69c5438e5c1c8a31e9 Mon Sep 17 00:00:00 2001 From: IceStormNG Date: Fri, 22 Mar 2024 17:29:47 +0100 Subject: [PATCH] Fix for Gladius III Aimpoint and Gladius III Aimpoint EVA02 (#2266) * 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 --- .../Mouse/Models/GladiusIIIAimpoint.cs | 49 +++++++++++++++++-- app/Peripherals/PeripheralsProvider.cs | 2 + 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/app/Peripherals/Mouse/Models/GladiusIIIAimpoint.cs b/app/Peripherals/Mouse/Models/GladiusIIIAimpoint.cs index f03dce95..2ba9321c 100644 --- a/app/Peripherals/Mouse/Models/GladiusIIIAimpoint.cs +++ b/app/Peripherals/Mouse/Models/GladiusIIIAimpoint.cs @@ -3,11 +3,11 @@ //P711 public class GladiusIIIAimpoint : AsusMouse { - public GladiusIIIAimpoint() : base(0x0B05, 0x1A70, "mi_00", true) + public GladiusIIIAimpoint() : base(0x0B05, 0x1A72, "mi_00", true) { } - protected GladiusIIIAimpoint(ushort vendorId, bool wireless) : base(0x0B05, vendorId, "mi_00", wireless) + protected GladiusIIIAimpoint(ushort productId, bool wireless) : base(0x0B05, productId, "mi_00", wireless) { } @@ -94,7 +94,7 @@ public class GladiusIIIAimpointWired : GladiusIIIAimpoint { - public GladiusIIIAimpointWired() : base(0x1A72, false) + public GladiusIIIAimpointWired() : base(0x1A70, false) { } @@ -103,4 +103,47 @@ return "ROG Gladius III Aimpoint (Wired)"; } } + + public class GladiusIIIAimpointEva2 : GladiusIIIAimpoint + { + public GladiusIIIAimpointEva2() : base(0x1B0C, true) + { + } + + public GladiusIIIAimpointEva2(ushort productId) : base(productId, false) + { + } + + public override string GetDisplayName() + { + return "ROG Gladius III Eva 2 (Wireless)"; + } + + public override LightingZone[] SupportedLightingZones() + { + return new LightingZone[] { LightingZone.Logo }; + } + + public override bool IsLightingModeSupported(LightingMode lightingMode) + { + return lightingMode == LightingMode.Static + || lightingMode == LightingMode.Breathing + || lightingMode == LightingMode.ColorCycle + || lightingMode == LightingMode.React + || lightingMode == LightingMode.Comet + || lightingMode == LightingMode.BatteryState; + } + } + + public class GladiusIIIAimpointEva2Wired : GladiusIIIAimpointEva2 + { + public GladiusIIIAimpointEva2Wired() : base(0x1B0A) + { + } + + public override string GetDisplayName() + { + return "ROG Gladius III Eva 2 (Wired)"; + } + } } diff --git a/app/Peripherals/PeripheralsProvider.cs b/app/Peripherals/PeripheralsProvider.cs index 7d600bb0..f073e339 100644 --- a/app/Peripherals/PeripheralsProvider.cs +++ b/app/Peripherals/PeripheralsProvider.cs @@ -198,6 +198,8 @@ namespace GHelper.Peripherals DetectMouse(new StrixImpactIIWirelessWired()); DetectMouse(new GladiusIII()); DetectMouse(new GladiusIIIWired()); + DetectMouse(new GladiusIIIAimpointEva2()); + DetectMouse(new GladiusIIIAimpointEva2Wired()); DetectMouse(new HarpeAceAimLabEdition()); DetectMouse(new HarpeAceAimLabEditionWired()); DetectMouse(new HarpeAceAimLabEditionOmni());