diff --git a/.github/ISSUE_TEMPLATE/peripherals_request.yml b/.github/ISSUE_TEMPLATE/peripherals_request.yml new file mode 100644 index 00000000..224cd89e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/peripherals_request.yml @@ -0,0 +1,31 @@ +name: Mouse and other peripherals support request +description: Request support for a new device +body: + - type: input + id: device + attributes: + label: Mouse / peripheral model and version + placeholder: e.g. Asus TUF M4 Wireless + validations: + required: true + - type: textarea + id: description + attributes: + label: Armoury Crate Screenshots + description: Connect your mouse to Armoury Crate (maybe in a VM if you do not want to install it on your PC) and upload here screenshots of all the pages for your mouse for settings. + placeholder: Drag and drop screenshots here + validations: + required: true + - type: textarea + id: solution + attributes: + label: USB Details + description: Also, please use USB Tree View and send the text (especially the block with all the child devices) of the mouse. image + placeholder: USB Tree View details + validations: + required: true + - type: textarea + id: additional + attributes: + label: Additional information. + placeholder: If applicable, add screenshots or other relevant information diff --git a/app/AppConfig.cs b/app/AppConfig.cs index 1456c10a..9c68b277 100644 --- a/app/AppConfig.cs +++ b/app/AppConfig.cs @@ -379,7 +379,7 @@ public static class AppConfig public static bool IsStrix() { - return ContainsModel("Strix") || ContainsModel("Scar"); + return ContainsModel("Strix") || ContainsModel("Scar") || ContainsModel("G703G"); } public static bool IsStrixLimitedRGB() diff --git a/app/Peripherals/Mouse/Models/StrixImpactIII.cs b/app/Peripherals/Mouse/Models/StrixImpactIII.cs new file mode 100644 index 00000000..95df3de3 --- /dev/null +++ b/app/Peripherals/Mouse/Models/StrixImpactIII.cs @@ -0,0 +1,77 @@ +namespace GHelper.Peripherals.Mouse.Models +{ + //P518 + public class StrixImpactIII : AsusMouse + { + public StrixImpactIII() : base(0x0B05, 0x1A88, "mi_00", false) + { + } + + + public override int DPIProfileCount() + { + return 4; + } + + public override string GetDisplayName() + { + return "ROG Strix Impact III"; + } + + + public override PollingRate[] SupportedPollingrates() + { + return new PollingRate[] { + PollingRate.PR125Hz, + PollingRate.PR250Hz, + PollingRate.PR500Hz, + PollingRate.PR1000Hz + }; + } + + public override int ProfileCount() + { + return 3; + } + + public override int MaxDPI() + { + return 12_000; + } + + public override bool HasRGB() + { + return true; + } + + public override LightingZone[] SupportedLightingZones() + { + return new LightingZone[] { LightingZone.Logo, LightingZone.Scrollwheel }; + } + + public override bool IsLightingModeSupported(LightingMode lightingMode) + { + return lightingMode == LightingMode.Static + || lightingMode == LightingMode.Breathing + || lightingMode == LightingMode.ColorCycle + || lightingMode == LightingMode.React + || lightingMode == LightingMode.Off; + } + + + public override bool HasBattery() + { + return false; + } + + public override bool HasAngleSnapping() + { + return true; + } + + public override bool HasLowBatteryWarning() + { + return false; + } + } +} diff --git a/app/Peripherals/Mouse/Models/TUFM3.cs b/app/Peripherals/Mouse/Models/TUFM3.cs index 57014589..633952bf 100644 --- a/app/Peripherals/Mouse/Models/TUFM3.cs +++ b/app/Peripherals/Mouse/Models/TUFM3.cs @@ -124,5 +124,11 @@ { return "TUF GAMING M3 (Gen II)"; } + + public override int MaxBrightness() + { + return 100; + } + } } diff --git a/app/Peripherals/PeripheralsProvider.cs b/app/Peripherals/PeripheralsProvider.cs index 28b5c3af..bfef7896 100644 --- a/app/Peripherals/PeripheralsProvider.cs +++ b/app/Peripherals/PeripheralsProvider.cs @@ -214,6 +214,7 @@ namespace GHelper.Peripherals DetectMouse(new ChakramCore()); DetectMouse(new SpathaX()); DetectMouse(new StrixCarry()); + DetectMouse(new StrixImpactIII()); } public static void DetectMouse(AsusMouse am) diff --git a/app/Program.cs b/app/Program.cs index 4c489fe1..003fb74d 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -280,7 +280,7 @@ namespace GHelper settingsForm.Left = Screen.FromControl(settingsForm).WorkingArea.Width - 10 - settingsForm.Width; if (AppConfig.IsAlly()) - settingsForm.Top = Screen.FromControl(settingsForm).Bounds.Height - 110 - settingsForm.Height; + settingsForm.Top = Math.Max(10, Screen.FromControl(settingsForm).Bounds.Height - 110 - settingsForm.Height); else settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height; diff --git a/docs/README.md b/docs/README.md index e52094ae..7f9647cb 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,7 +6,7 @@ Small and lightweight Armoury Crate alternative for Asus laptops offering almost same functionality without extra bloat and unnecessary services. 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 and many more! -# [:floppy_disk:Download](https://github.com/seerge/g-helper/releases/latest/download/GHelper.zip) +# [:floppy_disk:Download](https://github.com/seerge/g-helper/releases/download/v0.151/GHelper.zip) - [FAQ](https://github.com/seerge/g-helper/wiki/FAQ) - [Setup and Requirements](https://github.com/seerge/g-helper/wiki/Requirements) @@ -95,6 +95,7 @@ Each BIOS mode is paired with matching Windows Power Mode. You can adjust this s - ROG Keris Wireless - ROG Strix Carry (P508) - ROG Strix III Gladius III Aimpoint Wireless (P711) +- ROG Strix Impact III (P518) - ROG Spatha - ROG Strix Impact II Wireless - TUF Gaming M4 Wireless (P306)