From 3fec275fa03ab955cf231332a1f43ed4097c2e81 Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 24 Jun 2020 09:40:54 +1200 Subject: [PATCH] Finalise G531GT support --- CHANGELOG.md | 1 + README.md | 17 +++++++---------- rog-core/src/laptops.rs | 10 +++------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a955181..e523fd02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Add modes for FX531 LEDs - Change where USB reset is called +- Add support for G531GT ## [0.11.1] - 2020-11-06 ### Changed diff --git a/README.md b/README.md index e62542bd..519a2cac 100644 --- a/README.md +++ b/README.md @@ -37,22 +37,19 @@ I'm now looking at the kernel source to see if I can add the inputs correctly so ## SUPPORTED LAPTOPS -- GX502 (product 0x1866) (Tested on GX502GW) -- GA14 *is* supported, including the AniMe display. You will need kernel [patches](https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/-/tree/master/kernel_patches). - -**Partial/Inprogress:** -- GA15 appears to have most things working - GM501 (multizone needs testing) - -Both of these laptops appear to have the same USB device ID as the GX502, but with different features enabled. +- GX502 +- GX531 +- G531GT +- GA14/GA401 *is* supported, including the AniMe display. You will need kernel [patches](https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/-/tree/master/kernel_patches). +- GA15/GA502 appears to have most things working **Please help test or provide info for:** -- GL703(0x1869), GA502 (attempts to use same profile as GX502GW) +- GL703(0x1869) - GL553(0x1854) GL753 (attempted support from researching 2nd-hand info, multizone may work) -If the USB product ID is 0x1866 or 0x1869 then the per-key profile with hotkeys *should* work - 0x1866 is tested as this -is what I have. +**Laptop support is added on a per-case basis as the EC for the keyboard varies a little between models, e.g, some RGB modes are missing, or it's a single colour** ## Requirements for compiling diff --git a/rog-core/src/laptops.rs b/rog-core/src/laptops.rs index 1376c3c8..1639ecb1 100644 --- a/rog-core/src/laptops.rs +++ b/rog-core/src/laptops.rs @@ -58,15 +58,12 @@ fn choose_1866_device(prod: u16) -> LaptopBase { match &board_name.as_str()[..5] { "GA401" => { // Has no RGB control - info!("Found GA401 series"); laptop.support_animatrix = true; } "GA502" => { // Has no RGB control - info!("Found GA502 series"); } - "GX502" | "G531G" => { - info!("Found {} series", board_name.as_str()); + "GX502" => { laptop.supported_modes = vec![ BuiltInModeByte::Single, BuiltInModeByte::Breathing, @@ -83,7 +80,6 @@ fn choose_1866_device(prod: u16) -> LaptopBase { ]; } "GM501" => { - info!("Found GM501 series"); laptop.supported_modes = vec![ BuiltInModeByte::Single, BuiltInModeByte::Breathing, @@ -91,8 +87,7 @@ fn choose_1866_device(prod: u16) -> LaptopBase { BuiltInModeByte::Rainbow, ]; } - "GX531" => { - info!("Found GX531 series"); + "GX531" | "G531G" => { laptop.supported_modes = vec![ BuiltInModeByte::Single, BuiltInModeByte::Breathing, @@ -103,6 +98,7 @@ fn choose_1866_device(prod: u16) -> LaptopBase { } _ => panic!("Unsupported laptop: {}, please request support at\nhttps://github.com/flukejones/rog-core", board_name), } + info!("Board name: {}", board_name.as_str()); laptop }