Prep new release

Closes #402

Signed-off-by: Luke D. Jones <luke@ljones.dev>

.gitignore

@@ -14,7 +14,7 @@ vendor_*
 node-modules
 bindings/ts/*.d.ts
 bindings/ts/*.js.map
-desktop-extensions/gnome/dist
-desktop-extensions/gnome/node_modules
-desktop-extensions/gnome/schemas/gschemas.compiled
-desktop-extensions/gnome/*.zip
+desktop-extensions/gnome*/dist
+desktop-extensions/gnome*/node_modules
+desktop-extensions/gnome*/schemas/gschemas.compiled
+desktop-extensions/gnome*/*.zip

CHANGELOG.md

@@ -5,12 +5,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-## [v4.7.0-RC2]
+## [v4.7.2]
+### Added
+- Support for G733PZ LED modes
+- Support for G713RC LED modes
+
+### Changed
+- Fix loading of fan curves from stored settings
+
+## [v4.7.1]
+### Changed
+- Fixes to asusctl CLI tool to show fan curves
+- Fixes to asusd to ensure fan curve defaults are loaded if the config file fails
+- Further refine the asusctl CLI for fan-curve control
+- Fixes to AniMe detection
+- Fixes to aura config creation/loading
+
+### Added
+- Support for GV601V LED modes
+
+## [v4.7.0]
 ### Added
 - Support for FX507Z LED modes
 - Support for GL503V LED modes
 - Support for G733C LED modes
 - Support for GV601VI LED modes
+- Support for FX505G LED modes
+- Support for GA402X LED modes
 - Support for G634J LED modes (layout is in progress)
 - Support the Rear Glow on some laptops
 - Added field to aura_support to determine which LED power zones are supported. This will need folks to contribute data.
@@ -26,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add generation of typescript types from the rust types used via dbus using typeshare
 - Add generation of introspection XML from asusd dbus
 - Add a reworked gnome extension to the main repo under `desktop-extensions/gnome/`. This was done to better keep the extension in sync with work done on asusd, especially around breaking dbus
+- Add support for the mid fan custom curves on some laptops
 ### Changed
 - Move FX506HC to FX506H in arua DB to catch full series of this range
 - Move FX506LH to FX506L in arua DB to catch full series of this range
@@ -35,10 +57,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Prevent the multiple notifications from a profile change from occuring (too many functions with side effects!)
 - Apply keyboard brightness when setting a mode
 - Update GL503 led config
+- Arua LED power control has been heavily refactored for 0x19b6+ devices
 - Rog Control Center:
   - Added option to enable/disable system tray
   - Added button to fully quit app (exits from background)
   - Moved application settings to new page
+  - Aura LED power refactor is now taken advantage of in RCC, exposing all settings
 ### BREAKING
 - All Anime related DBUS methods/notifs are changed
 - All dbus interfaces that handled an enum have now been forced to use the enum as String type, not uint or similar, this unfortunately breaks a heap of stuff but has the benefit of allowing asusctl to use crates to generate a typescript (or other) binding to the types being used by zbus for the proxies. The implication here is that there will be an eventual tighter integration with the gnome extension and maybe KDE also.

Cargo.toml

@@ -1,9 +1,10 @@
 [workspace]
 members = ["asusctl", "asusd", "asusd-user", "config-traits", "rog-platform", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "rog-control-center", "simulators"]
 default-members = ["asusctl", "asusd", "asusd-user", "rog-control-center"]
+resolver = "2"
 
 [workspace.package]
-version = "4.7.0-RC1"
+version = "4.7.2"
 
 [workspace.dependencies]
 async-trait = "^0.1"
@@ -12,8 +13,8 @@ concat-idents = "^1.1"
 dirs = "^4.0"
 smol = "^1.3"
 
-zbus = "~3.13.1"
-logind-zbus = { version = "^3.1.0" } #, default-features = false, features = ["non_blocking"] }
+zbus = "~3.14.1"
+logind-zbus = { version = "~3.1" } #, default-features = false, features = ["non_blocking"] }
 
 serde = "^1.0"
 serde_derive = "^1.0"
@@ -48,6 +49,7 @@ lto = "fat"
 debug = false
 opt-level = 3
 panic = "abort"
+#codegen-units = 1
 
 [profile.dev]
 debug = true

README.md

@@ -1,6 +1,6 @@
 # `asusctl` for ASUS ROG
 
-[![](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/donate/?hosted_button_id=4V2DEPS7K6APC) - [Asus Linux Website](https://asus-linux.org/)
+[Become a Patron!](https://www.patreon.com/bePatron?u=7602281) - [Asus Linux Website](https://asus-linux.org/)
 
 **WARNING:** Many features are developed in tandem with kernel patches. If you see a feature is missing you either need a patched kernel, or v6.1 which has all my work merged upstream.
 

asusctl/src/anime_cli.rs

@@ -43,15 +43,27 @@ pub enum AnimeActions {
 pub struct Builtins {
     #[options(help = "print help message")]
     pub help: bool,
-    #[options(meta = "", help = " <GlitchConstruction, StaticEmergence>")]
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
+    )]
     pub boot: AnimBooting,
-    #[options(meta = "", help = "<BinaryBannerScroll, RogLogoGlitch>")]
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
+    )]
     pub awake: AnimAwake,
-    #[options(meta = "", help = "<BannerSwipe, Starfield>")]
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:BannerSwipe, Starfield>"
+    )]
     pub sleep: AnimSleeping,
-    #[options(meta = "", help = "<GlitchOut, SeeYa>")]
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:GlitchOut, SeeYa>"
+    )]
     pub shutdown: AnimShutdown,
-    #[options(meta = "", help = "set/apply the animations")]
+    #[options(meta = "", help = "set/apply the animations <true/false>")]
     pub set: Option<bool>,
 }
 

asusctl/src/aura_cli.rs

@@ -4,7 +4,7 @@ use gumdrop::Options;
 use rog_aura::error::Error;
 use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed};
 
-#[derive(Options)]
+#[derive(Options, Debug)]
 pub struct LedPowerCommand1 {
     #[options(help = "print help message")]
     pub help: bool,
@@ -20,63 +20,43 @@ pub struct LedPowerCommand1 {
     pub sleep: Option<bool>,
 }
 
-#[derive(Options)]
+#[derive(Options, Debug)]
 pub struct LedPowerCommand2 {
     #[options(help = "print help message")]
     pub help: bool,
     #[options(command)]
-    pub command: Option<SetAuraEnabled>,
+    pub command: Option<SetAuraZoneEnabled>,
 }
 
-#[derive(Options)]
-pub enum SetAuraEnabled {
+#[derive(Options, Debug)]
+pub enum SetAuraZoneEnabled {
     /// Applies to both old and new models
-    #[options(help = "set <keyboard, logo, lightbar, rearglow> to enabled while device is awake")]
-    Awake(AuraEnabled),
-    #[options(
-        help = "set <keyboard, logo, lightbar, rearglow> to enabled while the device is booting"
-    )]
-    Boot(AuraEnabled),
-    #[options(
-        help = "set <keyboard, logo, lightbar, rearglow> to animate while the device is suspended"
-    )]
-    Sleep(AuraEnabled),
-    #[options(
-        help = "set <keyboard, logo, lightbar, rearglow> to animate while the device is shutdown"
-    )]
-    Shutdown(AuraEnabled),
+    #[options(help = "")]
+    Keyboard(AuraPowerStates),
+    #[options(help = "")]
+    Logo(AuraPowerStates),
+    #[options(help = "")]
+    Lightbar(AuraPowerStates),
+    #[options(help = "")]
+    Lid(AuraPowerStates),
+    #[options(help = "")]
+    RearGlow(AuraPowerStates),
 }
 
-#[derive(Debug, Clone, Default, Options)]
-pub struct AuraEnabled {
+#[derive(Debug, Clone, Options)]
+pub struct AuraPowerStates {
     #[options(help = "print help message")]
     pub help: bool,
-    #[options(meta = "", help = "<true/false>")]
-    pub keyboard: Option<bool>,
-    #[options(meta = "", help = "<true/false>")]
-    pub logo: Option<bool>,
-    #[options(meta = "", help = "<true/false>")]
-    pub frontglow: Option<bool>,
-    #[options(meta = "", help = "<true/false>")]
-    pub rearglow: Option<bool>,
-    #[options(meta = "", help = "<true/false>")]
-    pub lid: Option<bool>,
+    #[options(help = "defaults to false if option unused")]
+    pub boot: bool,
+    #[options(help = "defaults to false if option unused")]
+    pub awake: bool,
+    #[options(help = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[options(help = "defaults to false if option unused")]
+    pub shutdown: bool,
 }
 
-// impl FromStr for AuraEnabled {
-//     type Err = Error;
-
-//     fn from_str(s: &str) -> Result<Self, Self::Err> {
-//         let s = s.to_lowercase();
-//         Ok(Self {
-//             help: false,
-//             keyboard: None,
-//             logo: None,
-//             lightbar: None,
-//         })
-//     }
-// }
-
 #[derive(Options)]
 pub struct LedBrightness {
     level: Option<u32>,

asusctl/src/main.rs

@@ -10,14 +10,15 @@ use gumdrop::{Opt, Options};
 use profiles_cli::{FanCurveCommand, ProfileCommand};
 use rog_anime::usb::get_anime_type;
 use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
-use rog_aura::usb::{AuraDevRog1, AuraDevRog2, AuraDevTuf, AuraDevice, AuraPowerDev};
+use rog_aura::power::KbAuraPowerState;
+use rog_aura::usb::{AuraDevRog1, AuraDevTuf, AuraDevice, AuraPowerDev};
 use rog_aura::{self, AuraEffect};
 use rog_dbus::RogDbusClientBlocking;
 use rog_platform::platform::GpuMode;
 use rog_platform::supported::*;
 use rog_profiles::error::ProfileError;
 
-use crate::aura_cli::LedBrightness;
+use crate::aura_cli::{AuraPowerStates, LedBrightness};
 use crate::cli_opts::*;
 
 mod anime_cli;
@@ -503,16 +504,14 @@ fn handle_led_power_1_do_1866(
     check(power.lightbar, AuraDevRog1::Lightbar);
 
     let data = AuraPowerDev {
-        x1866: enabled,
-        x19b6: vec![],
-        tuf: vec![],
+        old_rog: enabled,
+        ..Default::default()
     };
     dbus.proxies().led().set_led_power(data, true)?;
 
     let data = AuraPowerDev {
-        x1866: disabled,
-        x19b6: vec![],
-        tuf: vec![],
+        old_rog: disabled,
+        ..Default::default()
     };
     dbus.proxies().led().set_led_power(data, false)?;
 
@@ -542,16 +541,14 @@ fn handle_led_power_1_do_tuf(
     check(power.keyboard, AuraDevTuf::Keyboard);
 
     let data = AuraPowerDev {
-        x1866: vec![],
-        x19b6: vec![],
         tuf: enabled,
+        ..Default::default()
     };
     dbus.proxies().led().set_led_power(data, true)?;
 
     let data = AuraPowerDev {
-        x1866: vec![],
-        x19b6: vec![],
         tuf: disabled,
+        ..Default::default()
     };
     dbus.proxies().led().set_led_power(data, false)?;
 
@@ -591,66 +588,25 @@ fn handle_led_power2(
             println!("This option applies only to keyboards with product ID 0x19b6");
         }
 
-        let mut enabled: Vec<AuraDevRog2> = Vec::new();
-        let mut disabled: Vec<AuraDevRog2> = Vec::new();
-        let mut check = |e: Option<bool>, a: AuraDevRog2| {
-            if let Some(arg) = e {
-                if arg {
-                    enabled.push(a);
-                } else {
-                    disabled.push(a);
-                }
-            }
+        let set = |power: &mut KbAuraPowerState, set_to: &AuraPowerStates| {
+            power.boot = set_to.boot;
+            power.awake = set_to.awake;
+            power.sleep = set_to.sleep;
+            power.shutdown = set_to.shutdown;
         };
 
-        match pow {
-            aura_cli::SetAuraEnabled::Boot(arg) => {
-                check(arg.keyboard, AuraDevRog2::BootKeyb);
-                check(arg.logo, AuraDevRog2::BootLogo);
-                check(arg.frontglow, AuraDevRog2::BootBar);
-                check(arg.rearglow, AuraDevRog2::BootRearGlow);
-                check(arg.lid, AuraDevRog2::AwakeLid);
-            }
-            aura_cli::SetAuraEnabled::Sleep(arg) => {
-                check(arg.keyboard, AuraDevRog2::SleepKeyb);
-                check(arg.logo, AuraDevRog2::SleepLogo);
-                check(arg.frontglow, AuraDevRog2::SleepBar);
-                check(arg.rearglow, AuraDevRog2::SleepRearGlow);
-                check(arg.lid, AuraDevRog2::SleepLid);
-            }
-            aura_cli::SetAuraEnabled::Awake(arg) => {
-                check(arg.keyboard, AuraDevRog2::AwakeKeyb);
-                check(arg.logo, AuraDevRog2::AwakeLogo);
-                check(arg.frontglow, AuraDevRog2::AwakeBar);
-                check(arg.rearglow, AuraDevRog2::AwakeRearGlow);
-                check(arg.lid, AuraDevRog2::AwakeLid);
-            }
-            aura_cli::SetAuraEnabled::Shutdown(arg) => {
-                check(arg.keyboard, AuraDevRog2::ShutdownKeyb);
-                check(arg.logo, AuraDevRog2::ShutdownLogo);
-                check(arg.frontglow, AuraDevRog2::ShutdownBar);
-                check(arg.rearglow, AuraDevRog2::ShutdownRearGlow);
-                check(arg.lid, AuraDevRog2::ShutdownLid);
+        let mut enabled = dbus.proxies().led().led_power()?;
+        if let Some(cmd) = &power.command {
+            match cmd {
+                aura_cli::SetAuraZoneEnabled::Keyboard(k) => set(&mut enabled.rog.keyboard, k),
+                aura_cli::SetAuraZoneEnabled::Logo(l) => set(&mut enabled.rog.logo, l),
+                aura_cli::SetAuraZoneEnabled::Lightbar(l) => set(&mut enabled.rog.lightbar, l),
+                aura_cli::SetAuraZoneEnabled::Lid(l) => set(&mut enabled.rog.lid, l),
+                aura_cli::SetAuraZoneEnabled::RearGlow(r) => set(&mut enabled.rog.rear_glow, r),
             }
         }
 
-        if !enabled.is_empty() {
-            let data = AuraPowerDev {
-                tuf: vec![],
-                x1866: vec![],
-                x19b6: enabled,
-            };
-            dbus.proxies().led().set_led_power(data, true)?;
-        }
-
-        if !disabled.is_empty() {
-            let data = AuraPowerDev {
-                tuf: vec![],
-                x1866: vec![],
-                x19b6: disabled,
-            };
-            dbus.proxies().led().set_led_power(data, false)?;
-        }
+        dbus.proxies().led().set_led_power(enabled, true)?;
     }
 
     Ok(())
@@ -704,7 +660,7 @@ fn handle_fan_curve(
     supported: &PlatformProfileFunctions,
     cmd: &FanCurveCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if !supported.fan_curves {
+    if supported.fans.is_empty() {
         println!("Fan-curves not supported by either this kernel or by the laptop.");
         println!("This requires kernel 5.17 or the fan curve patch listed in the readme.");
         return Err(ProfileError::NotSupported.into());
@@ -722,16 +678,22 @@ fn handle_fan_curve(
         return Ok(());
     }
 
-    if (cmd.enabled.is_some() || cmd.fan.is_some() || cmd.data.is_some())
+    if (cmd.enable_fan_curves.is_some() || cmd.fan.is_some() || cmd.data.is_some())
         && cmd.mod_profile.is_none()
     {
-        println!("--enabled, --fan, and --data options require --mod-profile");
+        println!(
+            "--enable-fan-curves, --enable-fan-curve, --fan, and --data options require \
+             --mod-profile"
+        );
         return Ok(());
     }
 
     if cmd.get_enabled {
-        let res = dbus.proxies().profile().enabled_fan_profiles()?;
-        println!("{:?}", res);
+        let profile = dbus.proxies().profile().active_profile()?;
+        let curves = dbus.proxies().profile().fan_curve_data(profile)?;
+        for curve in curves.iter() {
+            println!("{}", String::from(curve));
+        }
     }
 
     if cmd.default {
@@ -739,16 +701,29 @@ fn handle_fan_curve(
     }
 
     if let Some(profile) = cmd.mod_profile {
-        if cmd.enabled.is_none() && cmd.data.is_none() {
+        if cmd.enable_fan_curves.is_none() && cmd.data.is_none() {
             let data = dbus.proxies().profile().fan_curve_data(profile)?;
             let data = toml::to_string(&data)?;
             println!("\nFan curves for {:?}\n\n{}", profile, data);
         }
 
-        if let Some(enabled) = cmd.enabled {
+        if let Some(enabled) = cmd.enable_fan_curves {
             dbus.proxies()
                 .profile()
-                .set_fan_curve_enabled(profile, enabled)?;
+                .set_fan_curves_enabled(profile, enabled)?;
+        }
+
+        if let Some(enabled) = cmd.enable_fan_curve {
+            if let Some(fan) = cmd.fan {
+                dbus.proxies()
+                    .profile()
+                    .set_profile_fan_curve_enabled(profile, fan, enabled)?;
+            } else {
+                println!(
+                    "--enable-fan-curves, --enable-fan-curve, --fan, and --data options require \
+                     --mod-profile"
+                );
+            }
         }
 
         if let Some(mut curve) = cmd.data.clone() {

asusctl/src/profiles_cli.rs

@@ -6,13 +6,16 @@ use rog_profiles::{FanCurvePU, Profile};
 pub struct ProfileCommand {
     #[options(help = "print help message")]
     pub help: bool,
+
     #[options(help = "toggle to next profile in list")]
     pub next: bool,
+
     #[options(help = "list available profiles")]
     pub list: bool,
 
     #[options(help = "get profile")]
     pub profile_get: bool,
+
     #[options(meta = "", help = "set the active profile")]
     pub profile_set: Option<Profile>,
 }
@@ -24,6 +27,7 @@ pub struct FanCurveCommand {
 
     #[options(help = "get enabled fan profiles")]
     pub get_enabled: bool,
+
     #[options(help = "set the active profile's fan curve to default")]
     pub default: bool,
 
@@ -32,21 +36,31 @@ pub struct FanCurveCommand {
         help = "profile to modify fan-curve for. Shows data if no options provided"
     )]
     pub mod_profile: Option<Profile>,
+
     #[options(
         meta = "",
-        help = "enable or disable <true/false> fan curve. `mod-profile` required"
+        help = "enable or disable <true/false> fan all curves for a profile. `--mod_profile` \
+                required"
     )]
-    pub enabled: Option<bool>,
+    pub enable_fan_curves: Option<bool>,
+
     #[options(
         meta = "",
-        help = "select fan <cpu/gpu> to modify. `mod-profile` required"
+        help = "enable or disable <true/false> a single fan curve for a profile. `--mod_profile` \
+                and `--fan` required"
+    )]
+    pub enable_fan_curve: Option<bool>,
+
+    #[options(
+        meta = "",
+        help = "select fan <cpu/gpu/mid> to modify. `--mod_profile` required"
     )]
     pub fan: Option<FanCurvePU>,
 
     #[options(
         meta = "",
-        help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%.
-                      `--mod-profile` required. If '%' is omitted the fan range is 0-255"
+        help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. \
+                `--mod-profile` required. If '%' is omitted the fan range is 0-255"
     )]
     pub data: Option<CurveData>,
 }

asusd/src/ctrl_anime/mod.rs

@@ -24,7 +24,11 @@ impl GetSupported for CtrlAnime {
     type A = AnimeSupportedFunctions;
 
     fn get_supported() -> Self::A {
-        AnimeSupportedFunctions(HidRaw::new("193b").is_ok())
+        if USBRaw::new(0x193b).is_ok() {
+            AnimeSupportedFunctions(true)
+        } else {
+            AnimeSupportedFunctions(HidRaw::new("193b").is_ok())
+        }
     }
 }
 
@@ -63,12 +67,12 @@ pub struct CtrlAnime {
 impl CtrlAnime {
     #[inline]
     pub fn new(config: AnimeConfig) -> Result<CtrlAnime, RogError> {
-        let hid = HidRaw::new("193b").ok();
         let usb = USBRaw::new(0x193b).ok();
-        let node = if hid.is_some() {
-            unsafe { Node::Hid(hid.unwrap_unchecked()) }
-        } else if usb.is_some() {
+        let hid = HidRaw::new("193b").ok();
+        let node = if usb.is_some() {
             unsafe { Node::Usb(usb.unwrap_unchecked()) }
+        } else if hid.is_some() {
+            unsafe { Node::Hid(hid.unwrap_unchecked()) }
         } else {
             return Err(RogError::Anime(AnimeError::NoDevice));
         };

asusd/src/ctrl_aura/config.rs

@@ -1,9 +1,12 @@
 use std::collections::{BTreeMap, HashSet};
 
 use config_traits::{StdConfig, StdConfigLoad};
-use rog_aura::aura_detection::LaptopLedData;
-use rog_aura::usb::{AuraDevRog1, AuraDevRog2, AuraDevTuf, AuraDevice, AuraPowerDev};
+use log::{debug, warn};
+use rog_aura::aura_detection::{LaptopLedData, ASUS_KEYBOARD_DEVICES};
+use rog_aura::power::AuraPower;
+use rog_aura::usb::{AuraDevRog1, AuraDevTuf, AuraDevice, AuraPowerDev};
 use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Direction, LedBrightness, Speed, GRADIENT};
+use rog_platform::hid_raw::HidRaw;
 use serde_derive::{Deserialize, Serialize};
 
 const CONFIG_FILE: &str = "aura.ron";
@@ -15,7 +18,7 @@ const CONFIG_FILE: &str = "aura.ron";
 pub enum AuraPowerConfig {
     AuraDevTuf(HashSet<AuraDevTuf>),
     AuraDevRog1(HashSet<AuraDevRog1>),
-    AuraDevRog2(HashSet<AuraDevRog2>),
+    AuraDevRog2(AuraPower),
 }
 
 impl AuraPowerConfig {
@@ -27,10 +30,7 @@ impl AuraPowerConfig {
                 let c: Vec<AuraDevRog1> = c.iter().copied().collect();
                 AuraDevRog1::to_bytes(&c)
             }
-            AuraPowerConfig::AuraDevRog2(c) => {
-                let c: Vec<AuraDevRog2> = c.iter().copied().collect();
-                AuraDevRog2::to_bytes(&c)
-            }
+            AuraPowerConfig::AuraDevRog2(c) => c.to_bytes(),
         }
     }
 
@@ -78,13 +78,9 @@ impl AuraPowerConfig {
         }
     }
 
-    pub fn set_0x19b6(&mut self, power: AuraDevRog2, on: bool) {
+    pub fn set_0x19b6(&mut self, power: AuraPower) {
         if let Self::AuraDevRog2(p) = self {
-            if on {
-                p.insert(power);
-            } else {
-                p.remove(&power);
-            }
+            *p = power;
         }
     }
 }
@@ -94,18 +90,15 @@ impl From<&AuraPowerConfig> for AuraPowerDev {
         match config {
             AuraPowerConfig::AuraDevTuf(d) => AuraPowerDev {
                 tuf: d.iter().copied().collect(),
-                x1866: vec![],
-                x19b6: vec![],
+                ..Default::default()
             },
             AuraPowerConfig::AuraDevRog1(d) => AuraPowerDev {
-                tuf: vec![],
-                x1866: d.iter().copied().collect(),
-                x19b6: vec![],
+                old_rog: d.iter().copied().collect(),
+                ..Default::default()
             },
             AuraPowerConfig::AuraDevRog2(d) => AuraPowerDev {
-                tuf: vec![],
-                x1866: vec![],
-                x19b6: d.iter().copied().collect(),
+                rog: d.clone(),
+                ..Default::default()
             },
         }
     }
@@ -123,9 +116,17 @@ pub struct AuraConfig {
 }
 
 impl StdConfig for AuraConfig {
+    /// Detect the keyboard type and load from default DB if data available
     fn new() -> Self {
-        // Self::create_default(AuraDevice::X19b6, &LaptopLedData::get_data())
-        panic!("AuraConfig::new() should not be used, use AuraConfig::create_default() instead");
+        warn!("AuraConfig: creating new config");
+        let mut prod_id = AuraDevice::Unknown;
+        for prod in ASUS_KEYBOARD_DEVICES {
+            if HidRaw::new(prod.into()).is_ok() {
+                prod_id = prod;
+                break;
+            }
+        }
+        Self::from_default_support(prod_id, &LaptopLedData::get_data())
     }
 
     fn config_dir() -> std::path::PathBuf {
@@ -140,27 +141,10 @@ impl StdConfig for AuraConfig {
 impl StdConfigLoad for AuraConfig {}
 
 impl AuraConfig {
-    pub fn create_default(prod_id: AuraDevice, support_data: &LaptopLedData) -> Self {
+    pub fn from_default_support(prod_id: AuraDevice, support_data: &LaptopLedData) -> Self {
         // create a default config here
         let enabled = if prod_id == AuraDevice::X19b6 {
-            AuraPowerConfig::AuraDevRog2(HashSet::from([
-                AuraDevRog2::BootLogo,
-                AuraDevRog2::BootKeyb,
-                AuraDevRog2::SleepLogo,
-                AuraDevRog2::SleepKeyb,
-                AuraDevRog2::AwakeLogo,
-                AuraDevRog2::AwakeKeyb,
-                AuraDevRog2::ShutdownLogo,
-                AuraDevRog2::ShutdownKeyb,
-                AuraDevRog2::BootBar,
-                AuraDevRog2::AwakeBar,
-                AuraDevRog2::SleepBar,
-                AuraDevRog2::ShutdownBar,
-                AuraDevRog2::BootRearGlow,
-                AuraDevRog2::AwakeRearGlow,
-                AuraDevRog2::SleepRearGlow,
-                AuraDevRog2::ShutdownRearGlow,
-            ]))
+            AuraPowerConfig::AuraDevRog2(AuraPower::new_all_on())
         } else if prod_id == AuraDevice::Tuf {
             AuraPowerConfig::AuraDevTuf(HashSet::from([
                 AuraDevTuf::Awake,
@@ -187,6 +171,7 @@ impl AuraConfig {
         };
 
         for n in &support_data.basic_modes {
+            debug!("AuraConfig: creating default for {n}");
             config
                 .builtins
                 .insert(*n, AuraEffect::default_with_mode(*n));
@@ -264,7 +249,8 @@ mod tests {
 
     #[test]
     fn set_multizone_4key_config() {
-        let mut config = AuraConfig::create_default(AuraDevice::X19b6, &LaptopLedData::default());
+        let mut config =
+            AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default());
 
         let effect = AuraEffect {
             colour1: Colour {
@@ -354,7 +340,8 @@ mod tests {
 
     #[test]
     fn set_multizone_multimode_config() {
-        let mut config = AuraConfig::create_default(AuraDevice::X19b6, &LaptopLedData::default());
+        let mut config =
+            AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default());
 
         let effect = AuraEffect {
             zone: AuraZone::Key1,

asusd/src/ctrl_aura/controller.rs

@@ -112,15 +112,17 @@ impl CtrlKbdLed {
             LEDNode::None
         };
 
-        let mut config_init = AuraConfig::create_default(led_prod, &supported_modes);
+        // New loads data fromt he DB also
+        let mut config_init = AuraConfig::new();
         let mut config_loaded = config_init.clone().load();
-
+        // update the initialised data with what we loaded from disk
         for mode in &mut config_init.builtins {
             // update init values from loaded values if they exist
             if let Some(loaded) = config_loaded.builtins.get(mode.0) {
                 *mode.1 = loaded.clone();
             }
         }
+        // Then replace just incase the initialised data contains new modes added
         config_loaded.builtins = config_init.builtins;
 
         if let (Some(mut multizone_init), Some(multizone_loaded)) =
@@ -414,7 +416,7 @@ mod tests {
     // #[ignore = "Must be manually run due to detection stage"]
     fn check_set_mode_errors() {
         // Checking to ensure set_mode errors when unsupported modes are tried
-        let config = AuraConfig::create_default(AuraDevice::X19b6, &LaptopLedData::default());
+        let config = AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default());
         let supported_modes = LaptopLedData {
             board_name: String::new(),
             layout_name: "ga401".to_owned(),
@@ -482,7 +484,7 @@ mod tests {
     #[test]
     fn create_multizone_if_no_config() {
         // Checking to ensure set_mode errors when unsupported modes are tried
-        let config = AuraConfig::create_default(AuraDevice::X19b6, &LaptopLedData::default());
+        let config = AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default());
         let supported_modes = LaptopLedData {
             board_name: String::new(),
             layout_name: "ga401".to_owned(),
@@ -521,7 +523,7 @@ mod tests {
     #[test]
     fn next_mode_create_multizone_if_no_config() {
         // Checking to ensure set_mode errors when unsupported modes are tried
-        let config = AuraConfig::create_default(AuraDevice::X19b6, &LaptopLedData::default());
+        let config = AuraConfig::from_default_support(AuraDevice::X19b6, &LaptopLedData::default());
         let supported_modes = LaptopLedData {
             board_name: String::new(),
             layout_name: "ga401".to_owned(),

asusd/src/ctrl_aura/trait_impls.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use config_traits::StdConfig;
-use log::{error, info, warn};
+use log::{debug, error, info, warn};
 use rog_aura::advanced::UsbPackets;
 use rog_aura::usb::{AuraDevice, AuraPowerDev};
 use rog_aura::{AuraEffect, AuraModeNum, LedBrightness};
@@ -53,48 +53,7 @@ impl CtrlKbdLedZbus {
     /// Set a variety of states, input is array of enum.
     /// `enabled` sets if the sent array should be disabled or enabled
     ///
-    /// ```text
-    /// pub struct AuraPowerDev {
-    ///     tuf: Vec<AuraDevTuf>,
-    ///     x1866: Vec<AuraDevRog1>,
-    ///     x19b6: Vec<AuraDevRog2>,
-    /// }
-    /// pub enum AuraDevTuf {
-    ///     Boot,
-    ///     Awake,
-    ///     Sleep,
-    ///     Keyboard,
-    /// }
-    /// pub enum AuraDevRog1 {
-    ///     Awake = 0x000002,
-    ///     Keyboard = 0x080000,
-    ///     Lightbar = 0x040500,
-    ///     Boot = 0xc31209,
-    ///     Sleep = 0x300804,
-    /// }
-    /// pub enum AuraDevRog2 {
-    ///     BootLogo = 1,
-    ///     BootKeyb = 1 << 1,
-    ///     AwakeLogo = 1 << 2,
-    ///     AwakeKeyb = 1 << 3,
-    ///     SleepLogo = 1 << 4,
-    ///     SleepKeyb = 1 << 5,
-    ///     ShutdownLogo = 1 << 6,
-    ///     ShutdownKeyb = 1 << 7,
-    ///     BootBar = 1 << (7 + 2),
-    ///     AwakeBar = 1 << (7 + 3),
-    ///     SleepBar = 1 << (7 + 4),
-    ///     ShutdownBar = 1 << (7 + 5),
-    ///     BootLid = 1 << (15 + 1),
-    ///     AwakeLid = 1 << (15 + 2),
-    ///     SleepLid = 1 << (15 + 3),
-    ///     ShutdownLid = 1 << (15 + 4),
-    ///     BootRearGlow = 1 << (23 + 1),
-    ///     AwakeRearGlow = 1 << (23 + 2),
-    ///     SleepRearGlow = 1 << (23 + 3),
-    ///     ShutdownRearGlow = 1 << (23 + 4),
-    /// }
-    /// ```
+    /// For Modern ROG devices the "enabled" flag is ignored.
     async fn set_led_power(
         &mut self,
         #[zbus(signal_context)] ctxt: SignalContext<'_>,
@@ -105,12 +64,10 @@ impl CtrlKbdLedZbus {
         for p in options.tuf {
             ctrl.config.enabled.set_tuf(p, enabled);
         }
-        for p in options.x1866 {
+        for p in options.old_rog {
             ctrl.config.enabled.set_0x1866(p, enabled);
         }
-        for p in options.x19b6 {
-            ctrl.config.enabled.set_0x19b6(p, enabled);
-        }
+        ctrl.config.enabled.set_0x19b6(options.rog);
 
         ctrl.config.write();
 
@@ -345,7 +302,9 @@ impl CtrlTask for CtrlKbdLedZbus {
 impl crate::Reloadable for CtrlKbdLedZbus {
     async fn reload(&mut self) -> Result<(), RogError> {
         let mut ctrl = self.0.lock().await;
+        debug!("CtrlKbdLedZbus: reloading keyboard mode");
         ctrl.write_current_config_mode()?;
+        debug!("CtrlKbdLedZbus: reloading power states");
         ctrl.set_power_states().map_err(|err| warn!("{err}")).ok();
         Ok(())
     }

asusd/src/ctrl_profiles/config.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use config_traits::{StdConfig, StdConfigLoad};
-use rog_profiles::fan_curve_set::FanCurveSet;
+use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::Profile;
 use serde_derive::{Deserialize, Serialize};
 
@@ -36,9 +36,9 @@ impl StdConfigLoad for ProfileConfig {}
 
 #[derive(Deserialize, Serialize, Debug, Default)]
 pub struct FanCurveConfig {
-    pub balanced: FanCurveSet,
-    pub performance: FanCurveSet,
-    pub quiet: FanCurveSet,
+    pub balanced: Vec<CurveData>,
+    pub performance: Vec<CurveData>,
+    pub quiet: Vec<CurveData>,
 }
 
 impl StdConfig for FanCurveConfig {
@@ -48,13 +48,13 @@ impl StdConfig for FanCurveConfig {
         Self::default()
     }
 
-    fn config_dir() -> std::path::PathBuf {
-        PathBuf::from(CONFIG_PATH_BASE)
-    }
-
     fn file_name(&self) -> String {
         CONFIG_FAN_FILE.to_owned()
     }
+
+    fn config_dir() -> std::path::PathBuf {
+        PathBuf::from(CONFIG_PATH_BASE)
+    }
 }
 
 impl StdConfigLoad for FanCurveConfig {}

asusd/src/ctrl_profiles/controller.rs

@@ -56,13 +56,9 @@ impl GetSupported for CtrlPlatformProfile {
             );
         }
 
-        let res = FanCurveProfiles::is_supported();
-        let mut fan_curve_supported = res.is_err();
-        if let Ok(r) = res {
-            fan_curve_supported = r;
-        };
+        let res = FanCurveProfiles::supported_fans();
 
-        if !fan_curve_supported {
+        if res.is_err() {
             info!(
                 "fan curves kernel interface not found, your laptop does not support this, or the \
                  interface is missing."
@@ -71,7 +67,7 @@ impl GetSupported for CtrlPlatformProfile {
 
         PlatformProfileFunctions {
             platform_profile: Profile::is_platform_profile_supported(),
-            fan_curves: fan_curve_supported,
+            fans: res.unwrap_or_default(),
         }
     }
 }
@@ -113,10 +109,10 @@ impl CtrlPlatformProfile {
                         let active = Profile::get_active_profile().unwrap_or(Profile::Balanced);
 
                         if let Some(curves) = controller.fan_curves.as_ref() {
-                            info!(
-                                "{MOD_NAME}: {active:?}: {}",
-                                String::from(curves.profiles().get_fan_curves_for(active))
-                            );
+                            info!("{MOD_NAME}: {active:?}:");
+                            for curve in curves.profiles().get_fan_curves_for(active) {
+                                info!("{}", String::from(curve));
+                            }
                         }
                     }
                     if let Some(curves) = controller.fan_curves.as_ref() {

asusd/src/ctrl_profiles/trait_impls.rs

@@ -4,8 +4,8 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use config_traits::StdConfig;
 use log::{error, info, warn};
-use rog_profiles::fan_curve_set::{CurveData, FanCurveSet};
-use rog_profiles::{FanCurveProfiles, Profile};
+use rog_profiles::fan_curve_set::CurveData;
+use rog_profiles::{FanCurvePU, FanCurveProfiles, Profile};
 use zbus::export::futures_util::lock::Mutex;
 use zbus::export::futures_util::StreamExt;
 use zbus::fdo::Error;
@@ -83,19 +83,9 @@ impl ProfileZbus {
             .ok();
     }
 
-    /// Get a list of profiles that have fan-curves enabled.
-    async fn enabled_fan_profiles(&mut self) -> zbus::fdo::Result<Vec<Profile>> {
-        let mut ctrl = self.0.lock().await;
-        ctrl.profile_config.read();
-        if let Some(curves) = &mut ctrl.fan_curves {
-            return Ok(curves.profiles().get_enabled_curve_profiles());
-        }
-        Err(Error::Failed(UNSUPPORTED_MSG.to_owned()))
-    }
-
-    /// Set a profile fan curve enabled status. Will also activate a fan curve
-    /// if in the same profile mode
-    async fn set_fan_curve_enabled(
+    /// Set all fan curves for a profile to enabled status. Will also activate a
+    /// fan curve if in the same profile mode
+    async fn set_fan_curves_enabled(
         &mut self,
         profile: Profile,
         enabled: bool,
@@ -105,7 +95,33 @@ impl ProfileZbus {
         if let Some(curves) = &mut ctrl.fan_curves {
             curves
                 .profiles_mut()
-                .set_profile_curve_enabled(profile, enabled);
+                .set_profile_curves_enabled(profile, enabled);
+
+            ctrl.write_profile_curve_to_platform()
+                .map_err(|e| warn!("{MOD_NAME}: write_profile_curve_to_platform, {}", e))
+                .ok();
+
+            ctrl.save_config();
+            Ok(())
+        } else {
+            Err(Error::Failed(UNSUPPORTED_MSG.to_owned()))
+        }
+    }
+
+    /// Set a single fan curve for a profile to enabled status. Will also
+    /// activate a fan curve if in the same profile mode
+    async fn set_profile_fan_curve_enabled(
+        &mut self,
+        profile: Profile,
+        fan: FanCurvePU,
+        enabled: bool,
+    ) -> zbus::fdo::Result<()> {
+        let mut ctrl = self.0.lock().await;
+        ctrl.profile_config.read();
+        if let Some(curves) = &mut ctrl.fan_curves {
+            curves
+                .profiles_mut()
+                .set_profile_fan_curve_enabled(profile, fan, enabled);
 
             ctrl.write_profile_curve_to_platform()
                 .map_err(|e| warn!("{MOD_NAME}: write_profile_curve_to_platform, {}", e))
@@ -119,12 +135,12 @@ impl ProfileZbus {
     }
 
     /// Get the fan-curve data for the currently active Profile
-    async fn fan_curve_data(&mut self, profile: Profile) -> zbus::fdo::Result<FanCurveSet> {
+    async fn fan_curve_data(&mut self, profile: Profile) -> zbus::fdo::Result<Vec<CurveData>> {
         let mut ctrl = self.0.lock().await;
         ctrl.profile_config.read();
         if let Some(curves) = &mut ctrl.fan_curves {
             let curve = curves.profiles().get_fan_curves_for(profile);
-            return Ok(curve.clone());
+            return Ok(curve.to_vec());
         }
         Err(Error::Failed(UNSUPPORTED_MSG.to_owned()))
     }

bindings/dbus-xml/org-asuslinux-aura-4.xml

@@ -11,51 +11,10 @@
      Set a variety of states, input is array of enum.
      `enabled` sets if the sent array should be disabled or enabled
 
-     ```text
-     pub struct AuraPowerDev {
-         tuf: Vec<AuraDevTuf>,
-         x1866: Vec<AuraDevRog1>,
-         x19b6: Vec<AuraDevRog2>,
-     }
-     pub enum AuraDevTuf {
-         Boot,
-         Awake,
-         Sleep,
-         Keyboard,
-     }
-     pub enum AuraDevRog1 {
-         Awake = 0x000002,
-         Keyboard = 0x080000,
-         Lightbar = 0x040500,
-         Boot = 0xc31209,
-         Sleep = 0x300804,
-     }
-     pub enum AuraDevRog2 {
-         BootLogo = 1,
-         BootKeyb = 1 << 1,
-         AwakeLogo = 1 << 2,
-         AwakeKeyb = 1 << 3,
-         SleepLogo = 1 << 4,
-         SleepKeyb = 1 << 5,
-         ShutdownLogo = 1 << 6,
-         ShutdownKeyb = 1 << 7,
-         BootBar = 1 << (7 + 2),
-         AwakeBar = 1 << (7 + 3),
-         SleepBar = 1 << (7 + 4),
-         ShutdownBar = 1 << (7 + 5),
-         BootLid = 1 << (15 + 1),
-         AwakeLid = 1 << (15 + 2),
-         SleepLid = 1 << (15 + 3),
-         ShutdownLid = 1 << (15 + 4),
-         BootRearGlow = 1 << (23 + 1),
-         AwakeRearGlow = 1 << (23 + 2),
-         SleepRearGlow = 1 << (23 + 3),
-         ShutdownRearGlow = 1 << (23 + 4),
-     }
-     ```
+     For Modern ROG devices the "enabled" flag is ignored.
      -->
     <method name="SetLedPower">
-      <arg name="options" type="(asasas)" direction="in"/>
+      <arg name="options" type="(asas((sbbbb)(sbbbb)(sbbbb)(sbbbb)(sbbbb)))" direction="in"/>
       <arg name="enabled" type="b" direction="in"/>
     </method>
     <method name="SetLedMode">
@@ -76,7 +35,7 @@
       <arg type="s" direction="out"/>
     </method>
     <method name="LedPower">
-      <arg type="asasas" direction="out"/>
+      <arg type="asas((sbbbb)(sbbbb)(sbbbb)(sbbbb)(sbbbb))" direction="out"/>
     </method>
     <!--
      Return the current mode data
@@ -102,7 +61,7 @@
       <arg name="data" type="(ss(yyy)(yyy)ss)"/>
     </signal>
     <signal name="NotifyPowerStates">
-      <arg name="data" type="(asasas)"/>
+      <arg name="data" type="(asas((sbbbb)(sbbbb)(sbbbb)(sbbbb)(sbbbb)))"/>
     </signal>
     <!--
      Return the current LED brightness

bindings/ts/aura.ts

@@ -107,6 +107,64 @@ export interface AuraEffect {
 	direction: Direction;
 }
 
+/** The powerr zones this laptop supports */
+export enum PowerZones {
+	/** The logo on some laptop lids */
+	Logo = "Logo",
+	/** The full keyboard (not zones) */
+	Keyboard = "Keyboard",
+	/** The lightbar, typically on the front of the laptop */
+	Lightbar = "Lightbar",
+	/** The leds that may be placed around the edge of the laptop lid */
+	Lid = "Lid",
+	/** The led strip on the rear of some laptops */
+	RearGlow = "RearGlow",
+}
+
+export interface KbAuraPowerState {
+	zone: PowerZones;
+	boot: boolean;
+	awake: boolean;
+	sleep: boolean;
+	shutdown: boolean;
+}
+
+/**
+ * Track and control the Aura keyboard power state
+ * 
+ * # Bits for newer 0x18c6, 0x19B6, 0x1a30, keyboard models
+ * 
+ * | Byte 1 | Byte 2  | Byte 3  | Byte 4  | Label    |
+ * |--------|---------|---------|---------|----------|
+ * |00000001| 00000000| 00000000| 00000000|boot_logo_|
+ * |00000010| 00000000| 00000000| 00000000|boot_keyb_|
+ * |00000100| 00000000| 00000000| 00000000|awake_logo|
+ * |00001000| 00000000| 00000000| 00000000|awake_keyb|
+ * |00010000| 00000000| 00000000| 00000000|sleep_logo|
+ * |00100000| 00000000| 00000000| 00000000|sleep_keyb|
+ * |01000000| 00000000| 00000000| 00000000|shut_logo_|
+ * |10000000| 00000000| 00000000| 00000000|shut_keyb_|
+ * |00000000| 00000010| 00000000| 00000000|boot_bar__|
+ * |00000000| 00000100| 00000000| 00000000|awake_bar_|
+ * |00000000| 00001000| 00000000| 00000000|sleep_bar_|
+ * |00000000| 00010000| 00000000| 00000000|shut_bar__|
+ * |00000000| 00000000| 00000001| 00000000|boot_lid__|
+ * |00000000| 00000000| 00000010| 00000000|awkae_lid_|
+ * |00000000| 00000000| 00000100| 00000000|sleep_lid_|
+ * |00000000| 00000000| 00001000| 00000000|shut_lid__|
+ * |00000000| 00000000| 00000000| 00000001|boot_rear_|
+ * |00000000| 00000000| 00000000| 00000010|awake_rear|
+ * |00000000| 00000000| 00000000| 00000100|sleep_rear|
+ * |00000000| 00000000| 00000000| 00001000|shut_rear_|
+ */
+export interface AuraPower {
+	keyboard: KbAuraPowerState;
+	logo: KbAuraPowerState;
+	lightbar: KbAuraPowerState;
+	lid: KbAuraPowerState;
+	rear_glow: KbAuraPowerState;
+}
+
 export enum AuraDevTuf {
 	Boot = "Boot",
 	Awake = "Awake",
@@ -138,74 +196,20 @@ export enum AuraDevRog1 {
 	Sleep = "Sleep",
 }
 
-/**
- * # Bits for newer 0x18c6, 0x19B6, 0x1a30, keyboard models
- * 
- * | Byte 1 | Byte 2  | Byte 3  | Byte 4  | Label    |
- * |--------|---------|---------|---------|----------|
- * |00000001| 00000000| 00000000| 00000000|boot_logo_|
- * |00000010| 00000000| 00000000| 00000000|boot_keyb_|
- * |00000100| 00000000| 00000000| 00000000|awake_logo|
- * |00001000| 00000000| 00000000| 00000000|awake_keyb|
- * |00010000| 00000000| 00000000| 00000000|sleep_logo|
- * |00100000| 00000000| 00000000| 00000000|sleep_keyb|
- * |01000000| 00000000| 00000000| 00000000|shut_logo_|
- * |10000000| 00000000| 00000000| 00000000|shut_keyb_|
- * |00000000| 00000010| 00000000| 00000000|boot_bar__|
- * |00000000| 00000100| 00000000| 00000000|awake_bar_|
- * |00000000| 00001000| 00000000| 00000000|sleep_bar_|
- * |00000000| 00010000| 00000000| 00000000|shut_bar__|
- * |00000000| 00000000| 00000001| 00000000|boot_lid__|
- * |00000000| 00000000| 00000010| 00000000|awkae_lid_|
- * |00000000| 00000000| 00000100| 00000000|sleep_lid_|
- * |00000000| 00000000| 00001000| 00000000|shut_lid__|
- * |00000000| 00000000| 00000000| 00000001|boot_rear_|
- * |00000000| 00000000| 00000000| 00000010|awake_rear|
- * |00000000| 00000000| 00000000| 00000100|sleep_rear|
- * |00000000| 00000000| 00000000| 00001000|shut_rear_|
- */
-export enum AuraDevRog2 {
-	BootLogo = "BootLogo",
-	BootKeyb = "BootKeyb",
-	AwakeLogo = "AwakeLogo",
-	AwakeKeyb = "AwakeKeyb",
-	SleepLogo = "SleepLogo",
-	SleepKeyb = "SleepKeyb",
-	ShutdownLogo = "ShutdownLogo",
-	ShutdownKeyb = "ShutdownKeyb",
-	BootBar = "BootBar",
-	AwakeBar = "AwakeBar",
-	SleepBar = "SleepBar",
-	ShutdownBar = "ShutdownBar",
-	BootLid = "BootLid",
-	AwakeLid = "AwakeLid",
-	SleepLid = "SleepLid",
-	ShutdownLid = "ShutdownLid",
-	BootRearGlow = "BootRearGlow",
-	AwakeRearGlow = "AwakeRearGlow",
-	SleepRearGlow = "SleepRearGlow",
-	ShutdownRearGlow = "ShutdownRearGlow",
-}
-
 /** This struct is intended as a helper to pass args to generic dbus interface */
 export interface AuraPowerDev {
+	/**
+	 * TUF laptops use a similar style of control to the older ROG devices but
+	 * through WMI
+	 */
 	tuf: AuraDevTuf[];
-	x1866: AuraDevRog1[];
-	x19b6: AuraDevRog2[];
-}
-
-/** The powerr zones this laptop supports */
-export enum PowerZones {
-	/** The logo on some laptop lids */
-	Logo = "Logo",
-	/** The full keyboard (not zones) */
-	Keyboard = "Keyboard",
-	/** The lightbar, typically on the front of the laptop */
-	Lightbar = "Lightbar",
-	/** The leds that may be placed around the edge of the laptop lid */
-	Lid = "Lid",
-	/** The led strip on the rear of some laptops */
-	RearGlow = "RearGlow",
+	/**
+	 * Pre-0x19b6 devices use a different smaller scheme to the newer ROG
+	 * devices
+	 */
+	old_rog: AuraDevRog1[];
+	/** ASUS standardised control scheme from 2020 onwards */
+	rog: AuraPower;
 }
 
 export enum LedBrightness {

desktop-extensions/gnome-44/src/extension.ts

@@ -1,5 +1,3 @@
-// REF: https://gjs.guide/extensions/development/creating.html
-
 import { AnimeDbus } from "./modules/dbus/animatrix";
 import { Power } from "./modules/dbus/power";
 import { Supported } from "./modules/dbus/supported";

desktop-extensions/gnome-44/src/metadata.json

@@ -6,6 +6,6 @@
   "settings-schema": "org.gnome.shell.extensions.asusctl-gnome",
   "version": "4.3.2",
   "shell-version": [
-    "43", "44"
+    "43", "44", "45"
   ]
 }

desktop-extensions/gnome-44/src/modules/dbus/aura.ts

@@ -1,4 +1,4 @@
-import { AuraDevRog1, AuraDevRog2, AuraDevTuf, AuraDevice, AuraEffect, AuraModeNum, AuraPowerDev, AuraZone, Direction, Speed } from "../../bindings/aura";
+import { AuraDevRog1, AuraDevTuf, AuraDevice, AuraEffect, AuraModeNum, AuraPower, AuraPowerDev, AuraZone, Direction, PowerZones, Speed } from "../../bindings/aura";
 import { DbusBase } from "./base";
 
 export class AuraDbus extends DbusBase {
@@ -7,8 +7,44 @@ export class AuraDbus extends DbusBase {
     public aura_modes: Map<AuraModeNum, AuraEffect> = new Map;
     public leds_powered: AuraPowerDev = {
         tuf: [],
-        x1866: [],
-        x19b6: []
+        old_rog: [],
+        rog: {
+            keyboard: {
+                zone: PowerZones.Keyboard,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            logo: {
+                zone: PowerZones.Logo,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            lightbar: {
+                zone: PowerZones.Lightbar,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            lid: {
+                zone: PowerZones.Lid,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            rear_glow: {
+                zone: PowerZones.RearGlow,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+        }
     };
     // TODO: interface or something to enforce requirement of "sync()" method
     public notifyAuraModeSubscribers: any[] = [];
@@ -32,21 +68,51 @@ export class AuraDbus extends DbusBase {
     }
 
     _parsePowerStates(data: any[]) {
-        const power: AuraPowerDev = {
-            tuf: [],
-            x1866: [],
-            x19b6: []
-        };
+        const power: AuraPowerDev = this.leds_powered;
 
         power.tuf = data[0].map((value: string) => {
             return AuraDevTuf[value as AuraDevTuf];
         });
-        power.x1866 = data[1].map((value: string) => {
+        power.old_rog = data[1].map((value: string) => {
             return AuraDevRog1[value as AuraDevRog1];
         });
-        power.x19b6 = data[2].map((value: string) => {
-            return AuraDevRog2[value as AuraDevRog2];
-        });
+        power.rog = {
+            keyboard: {
+                zone: PowerZones[data[2][0][0] as PowerZones],
+                boot: data[2][0][1],
+                awake: data[2][0][2],
+                sleep: data[2][0][3],
+                shutdown: data[2][0][4]
+            },
+            logo: {
+                zone: PowerZones[data[2][1][0] as PowerZones],
+                boot: data[2][1][1],
+                awake: data[2][1][2],
+                sleep: data[2][1][3],
+                shutdown: data[2][1][4]
+            },
+            lightbar: {
+                zone: PowerZones[data[2][2][0] as PowerZones],
+                boot: data[2][2][1],
+                awake: data[2][2][2],
+                sleep: data[2][2][3],
+                shutdown: data[2][2][4]
+            },
+            lid: {
+                zone: PowerZones[data[2][3][0] as PowerZones],
+                boot: data[2][3][1],
+                awake: data[2][3][2],
+                sleep: data[2][3][3],
+                shutdown: data[2][3][4]
+            },
+            rear_glow: {
+                zone: PowerZones[data[2][4][0] as PowerZones],
+                boot: data[2][4][1],
+                awake: data[2][4][2],
+                sleep: data[2][4][3],
+                shutdown: data[2][4][4]
+            }
+        };
 
         return power;
     }
@@ -59,9 +125,9 @@ export class AuraDbus extends DbusBase {
                 //@ts-ignore
                 log("LED power tuf: " + this.leds_powered.tuf);
                 //@ts-ignore
-                log("LED power x1866: " + this.leds_powered.x1866);
+                log("LED power x1866: " + this.leds_powered.old_rog);
                 //@ts-ignore
-                log("LED power x19b6: " + this.leds_powered.x19b6);
+                log("LED power x19b6: " + this.leds_powered.rog);
             } catch (e) {
                 //@ts-ignore
                 log("Failed to fetch supported functionalities", e);
@@ -180,26 +246,26 @@ export class AuraDbus extends DbusBase {
                         const power: AuraPowerDev = this._parsePowerStates(data[0]);
                         this.leds_powered = power;
                         switch (this.device) {
-                        case AuraDevice.Tuf:
-                            //@ts-ignore
-                            log("LED power has changed to ", this.leds_powered.tuf);
-                            break;
-                        case AuraDevice.X1854:
-                        case AuraDevice.X1869:
-                        case AuraDevice.X18c6:
-                            //@ts-ignore
-                            log("LED power has changed to ", this.leds_powered.x1866);
-                            break;
-                        case AuraDevice.X19b6:
-                        case AuraDevice.X1a30:
-                            //@ts-ignore
-                            log("LED power has changed to ", this.leds_powered.x19b6);
-                            break;
-                        default:
-                            break;
+                            case AuraDevice.Tuf:
+                                //@ts-ignore
+                                log("LED power has changed to ", this.leds_powered.tuf);
+                                break;
+                            case AuraDevice.X1854:
+                            case AuraDevice.X1869:
+                            case AuraDevice.X18c6:
+                                //@ts-ignore
+                                log("LED power has changed to ", this.leds_powered.old_rog);
+                                break;
+                            case AuraDevice.X19b6:
+                            case AuraDevice.X1a30:
+                                //@ts-ignore
+                                log("LED power has changed to ", this.leds_powered.rog);
+                                break;
+                            default:
+                                break;
                         }
                         //@ts-ignore
-                        log("LED power has changed to ", this.leds_powered.x19b6);
+                        log("LED power has changed to ", this.leds_powered.rog);
                         this.notifyAuraPowerSubscribers.forEach(sub => {
                             sub.sync();
                         });

desktop-extensions/gnome-44/yarn.lock

@@ -0,0 +1,940 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@esbuild/linux-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz"
+  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
+
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0":
+  version "4.5.1"
+  resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+
+"@eslint/eslintrc@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz"
+  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.44.0":
+  version "8.44.0"
+  resolved "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz"
+  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
+    debug "^4.1.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@types/json-schema@^7.0.9":
+  version "7.0.12"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
+"@types/semver@^7.3.12":
+  version "7.5.0"
+  resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+
+"@typescript-eslint/eslint-plugin@^5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz"
+  integrity sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.60.1"
+    "@typescript-eslint/type-utils" "5.60.1"
+    "@typescript-eslint/utils" "5.60.1"
+    debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.60.1.tgz"
+  integrity sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.60.1"
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/typescript-estree" "5.60.1"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz"
+  integrity sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==
+  dependencies:
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/visitor-keys" "5.60.1"
+
+"@typescript-eslint/type-utils@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz"
+  integrity sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.60.1"
+    "@typescript-eslint/utils" "5.60.1"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz"
+  integrity sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==
+
+"@typescript-eslint/typescript-estree@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz"
+  integrity sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==
+  dependencies:
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/visitor-keys" "5.60.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz"
+  integrity sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.60.1"
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/typescript-estree" "5.60.1"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
+"@typescript-eslint/visitor-keys@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz"
+  integrity sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==
+  dependencies:
+    "@typescript-eslint/types" "5.60.1"
+    eslint-visitor-keys "^3.3.0"
+
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.9.0:
+  version "8.9.0"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
+
+adm-zip@^0.5.10:
+  version "0.5.10"
+  resolved "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz"
+  integrity sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==
+
+ajv@^6.10.0, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+esbuild@^0.17.19:
+  version "0.17.19"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"
+  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+  optionalDependencies:
+    "@esbuild/android-arm" "0.17.19"
+    "@esbuild/android-arm64" "0.17.19"
+    "@esbuild/android-x64" "0.17.19"
+    "@esbuild/darwin-arm64" "0.17.19"
+    "@esbuild/darwin-x64" "0.17.19"
+    "@esbuild/freebsd-arm64" "0.17.19"
+    "@esbuild/freebsd-x64" "0.17.19"
+    "@esbuild/linux-arm" "0.17.19"
+    "@esbuild/linux-arm64" "0.17.19"
+    "@esbuild/linux-ia32" "0.17.19"
+    "@esbuild/linux-loong64" "0.17.19"
+    "@esbuild/linux-mips64el" "0.17.19"
+    "@esbuild/linux-ppc64" "0.17.19"
+    "@esbuild/linux-riscv64" "0.17.19"
+    "@esbuild/linux-s390x" "0.17.19"
+    "@esbuild/linux-x64" "0.17.19"
+    "@esbuild/netbsd-x64" "0.17.19"
+    "@esbuild/openbsd-x64" "0.17.19"
+    "@esbuild/sunos-x64" "0.17.19"
+    "@esbuild/win32-arm64" "0.17.19"
+    "@esbuild/win32-ia32" "0.17.19"
+    "@esbuild/win32-x64" "0.17.19"
+
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint@*, "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", eslint@^8.44.0:
+  version "8.44.0"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz"
+  integrity sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.1.0"
+    "@eslint/js" "8.44.0"
+    "@humanwhocodes/config-array" "^0.11.10"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.6.0"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    strip-json-comments "^3.1.0"
+    text-table "^0.2.0"
+
+espree@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz"
+  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.2.9:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz"
+  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
+fastq@^1.6.0:
+  version "1.15.0"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  dependencies:
+    reusify "^1.0.4"
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@^7.1.3:
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+ignore@^5.2.0:
+  version "5.2.4"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
+minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+punycode@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+semver@^7.3.7:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+typescript@^5.1.6, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
+  version "5.1.6"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"
+  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

desktop-extensions/gnome-45/.eslintrc.cjs

@@ -0,0 +1,25 @@
+/* eslint-env node */
+module.exports = {
+    extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+    parser: "@typescript-eslint/parser",
+    plugins: ["@typescript-eslint"],
+    root: true,
+
+    "rules": {
+    // enable additional rules
+        "indent": ["error", 4],
+        "linebreak-style": ["error", "unix"],
+        "quotes": ["error", "double"],
+        "semi": ["error", "always"],
+
+        // override configuration set by extending "eslint:recommended"
+        "no-empty": "warn",
+        "no-cond-assign": ["error", "always"],
+
+        // disable rules from base configurations
+        "for-direction": "off",
+
+        "@typescript-eslint/no-explicit-any": "warn",
+        "@typescript-eslint/ban-ts-comment": "off"
+    }
+};

desktop-extensions/gnome-45/LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

desktop-extensions/gnome-45/README.md

@@ -0,0 +1,21 @@
+# asusctl
+
+Requires `asusd` to be installed and running.
+
+## build and install
+
+```
+npm install
+npm run build && gnome-extensions install asusctl-gnome@asus-linux.org.zip --force
+npm run build && gnome-extensions enable asusctl-gnome@asus-linux.org.zip
+```
+
+You will need to restart Gnome after installing or updating
+
+## development
+
+```
+npm run build
+gnome-extensions install asusctl-gnome@asus-linux.org.zip --force
+MUTTER_DEBUG_DUMMY_MODE_SPECS=1366x768 dbus-run-session -- gnome-shell --nested --wayland
+```

desktop-extensions/gnome-45/esbuild.js

@@ -0,0 +1,65 @@
+const { build } = require("esbuild");
+const fs = require("fs");
+const path = require("path");
+var exec = require('child_process').exec;
+const AdmZip = require("adm-zip");
+const metadata = require("./src/metadata.json");
+
+build({
+  entryPoints: ['src/extension.ts'],
+  outdir: 'dist',
+  bundle: true,
+  // Do not remove the functions `enable()`, `disable()` and `init()`
+  treeShaking: false,
+  // firefox60  // Since GJS 1.53.90
+  // firefox68  // Since GJS 1.63.90
+  // firefox78  // Since GJS 1.65.90
+  // firefox91  // Since GJS 1.71.1
+  // firefox102 // Since GJS 1.73.2
+  target: "firefox102",
+  platform: "node",
+  // platform: "neutral",
+  // mainFields: ['main'],
+  // conditions: ['require', 'default'],
+  format: 'esm',
+  external: ['gi://*', 'resource:///*', 'system', 'gettext', 'cairo'],
+}).then(() => {
+  const metaSrc = path.resolve(__dirname, "src/metadata.json");
+  const metaDist = path.resolve(__dirname, "dist/metadata.json");
+  const schemaSrc = path.resolve(__dirname, "schemas");
+  const schemaDist = path.resolve(__dirname, "dist/schemas");
+  const dbusXmlSrc = path.resolve(__dirname, "../../bindings/dbus-xml");
+  const dbusXmlDist = path.resolve(__dirname, "dist/resources/dbus");
+  const zipFilename = `${metadata.uuid}.zip`;
+  const zipDist = path.resolve(__dirname, zipFilename);
+
+  exec('glib-compile-schemas schemas/',
+    (error, stdout, stderr) => {
+      console.log('stdout: ' + stdout);
+      console.log('stderr: ' + stderr);
+    });
+
+  fs.copyFileSync(metaSrc, metaDist);
+
+  fs.cpSync(schemaSrc, schemaDist, { recursive: true }, (err) => {
+    if (err) {
+      console.error(err);
+    }
+  });
+
+  fs.cpSync(dbusXmlSrc, dbusXmlDist, { recursive: true }, (err) => {
+    if (err) {
+      console.error(err);
+    }
+  });
+
+  const zip = new AdmZip();
+  zip.addLocalFolder(path.resolve(__dirname, "dist"));
+  zip.writeZip(zipDist);
+
+  console.log(`Build complete. Zip file: ${zipFilename}\n`);
+  console.log(`Install with: gnome-extensions install ${zipFilename}`)
+  console.log(`Update with: gnome-extensions install ${zipFilename} --force`)
+  console.log(`Enable with: gnome-extensions enable ${metadata.uuid} --user`)
+});
+

desktop-extensions/gnome-45/generate.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+## Script to initialise dev-environment (types)
+gv="44"
+wd=${PWD}
+
+# cleanup
+rm -rf @types
+
+# generate GJS from gir (this does not include the extensions)
+echo "Generating GJS types from gir.."
+npx ts-for-gir generate Shell-12 St-12 Gtk-4.0 \
+  -g /usr/share/gir-1.0 \
+  -g /usr/share/gnome-shell \
+  -g /usr/share/gnome-shell/gir-1.0 \
+  -g /usr/lib64/mutter-12 \
+  -t esm -o @types/Gjs
+
+# get latest js (44) in this case and create the types for it
+echo "Generating GJS Extension (Gex) types from extension source.."
+mkdir -p ./_tmp/
+cd ./_tmp
+wget -q -O gnome-shell-js-${gv}.tar.gz https://gitlab.gnome.org/GNOME/gnome-shell/-/archive/gnome-${gv}/gnome-shell-gnome-${gv}.tar.gz?path=js
+tar xf gnome-shell-js-${gv}.tar.gz
+cd gnome-shell-gnome-${gv}-js
+cat >tsconfig.json <<EOL
+{
+  "include": ["js/ui/*"],
+  "exclude": [
+    "js/ui/shellDBus.js",
+    "node_modules",
+    "**/node_modules/*"
+  ],
+  "compilerOptions": {
+    "allowJs": true,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "gex-types",
+    "declarationMap": true,
+    "lib": ["es2019"]
+  }
+}
+EOL
+npx tsc
+cd ${wd}
+mv ./_tmp/gnome-shell-gnome-${gv}-js/gex-types @types/Gex
+# rm -rf ./_tmp/
+
+echo "done."
+
+exit 0

desktop-extensions/gnome-45/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "asusctl-gnome",
+  "version": "4.7.0",
+  "description": "asusctl-gnome a gnome extension exposing some of the base features of asusd in a helpful and easy to use way",
+  "main": "dist/extension.js",
+  "scripts": {
+    "clear": "rm -rf dist",
+    "build:app": "node esbuild.js",
+    "build": "yarn run clear && yarn run build:app",
+    "validate": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1",
+    "adm-zip": "^0.5.10",
+    "esbuild": "^0.17.19",
+    "eslint": "^8.44.0",
+    "typescript": "^5.1.6"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@gitlab.com/asus-linux/asusctl.git"
+  },
+  "keywords": [
+    "gnome-shell",
+    "extension",
+    "asusctl",
+    "asus",
+    "rog",
+    "gnome",
+    "gjs",
+    "typescript"
+  ],
+  "author": "Armas Spann, Marco Laux, Luke Jones",
+  "license": "MPL-2",
+  "bugs": {
+    "url": "https://gitlab.com/asus-linux/asusctl/issues"
+  },
+  "homepage": "https://gitlab.com/asus-linux/asusctl/desktop-extensions/gnome#readme"
+}

desktop-extensions/gnome-45/schemas/org.gnome.shell.extensions.asusctl-gnome.gschema.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="AsusctlGnomeExtension">
+  <schema id="org.gnome.shell.extensions.asusctl-gnome" path="/org/gnome/shell/extensions/asusctl-gnome/" >
+    <key type="b" name="mini-led-enabled">
+      <default>false</default>
+    </key>
+    <key type="b" name="panel-od-enabled">
+      <default>false</default>
+    </key>
+    <key type="b" name="anime-power">
+      <default>false</default>
+    </key>
+    <key name="charge-level" type="u">
+      <range min="20" max="100"/>
+      <default>100</default>
+    </key>
+    <key type="s" name="primary-quickmenu-toggle">
+      <default>"mini-led"</default>
+    </key>
+  </schema>
+</schemalist>

desktop-extensions/gnome-45/src/bindings

@@ -0,0 +1 @@
+../../../bindings/ts

desktop-extensions/gnome-45/src/extension.ts

@@ -0,0 +1,117 @@
+import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+
+import { AnimeDbus } from "./modules/dbus/animatrix";
+import { Power } from "./modules/dbus/power";
+import { Supported } from "./modules/dbus/supported";
+import { Platform } from "./modules/dbus/platform";
+
+import { QuickPanelOd } from "./modules/quick_toggles/panel_od";
+import { IndicateMiniLed } from "./modules/indicators/mini_led";
+import { QuickMiniLed } from "./modules/quick_toggles/mini_led";
+import { SliderChargeLevel } from "./modules/sliders/charge";
+import { QuickAnimePower } from "./modules/quick_toggles/anime_power";
+import { FeatureMenuToggle } from "./modules/quick_menus/laptop_features";
+import { AuraDbus } from "./modules/dbus/aura";
+import { AuraMenuToggle } from "./modules/quick_menus/aura";
+
+export var extension;
+
+export default class AsusExtension extends Extension {
+    private _indicateMiniLed: typeof IndicateMiniLed;
+    private _quickMiniLed: typeof QuickMiniLed;
+    private _quickPanelOd: typeof QuickPanelOd;
+    private _quickAnimePower: typeof QuickAnimePower;
+    private _featureMenuToggle: typeof FeatureMenuToggle;
+    private _auraModeMenuToggle: typeof AuraMenuToggle;
+    private _sliderCharge: typeof SliderChargeLevel;
+
+    public dbus_supported: Supported = new Supported;
+    public dbus_power: Power = new Power;
+    public dbus_aura: AuraDbus = new AuraDbus;
+    public dbus_anime: AnimeDbus = new AnimeDbus;
+    public dbus_platform: Platform = new Platform;
+    public extensionPath: any = null;
+
+    settings() {
+        return this._settings;
+    }
+
+    async enable() {
+        this._settings = this.getSettings();
+        this.extensionPath = this.path;
+        extension = this;
+
+        this._indicateMiniLed = null;
+        this._quickMiniLed = null;
+        this._quickPanelOd = null;
+        this._quickAnimePower = null;
+        this._sliderCharge = null;
+
+        await this.dbus_supported.start();
+        await this.dbus_aura.start();
+        await this.dbus_platform.start();
+        await this.dbus_power.start();
+        await this.dbus_anime.start();
+
+        if (this._featureMenuToggle == null) {
+            this._featureMenuToggle = new FeatureMenuToggle(this.dbus_supported, this.dbus_platform, this.dbus_anime);
+        }
+        if (this._auraModeMenuToggle == null) {
+            this._auraModeMenuToggle = new AuraMenuToggle(this.dbus_aura);
+        }
+        if (this.dbus_supported.supported.rog_bios_ctrl.mini_led_mode) {
+            // if (this._quickMiniLed == null) {
+            //     this._quickMiniLed = new QuickMiniLed(this.dbus_platform);
+            //     this.dbus_platform.notifyMiniLedSubscribers.push(this._quickMiniLed);
+            // }
+            if (this._indicateMiniLed == null) {
+                this._indicateMiniLed = new IndicateMiniLed(this.dbus_platform);
+            }
+        }
+        // if (this.dbus_supported.supported.rog_bios_ctrl.panel_overdrive) {
+        //     if (this._quickPanelOd == null) {
+        //         this._quickPanelOd = new QuickPanelOd(this.dbus_platform);
+        //         this.dbus_platform.notifyPanelOdSubscribers.push(this._quickPanelOd);
+        //     }
+        // }
+        // if (this.dbus_supported.supported.anime_ctrl) {
+        //     if (this._quickAnimePower == null) {
+        //         this._quickAnimePower = new QuickAnimePower(this._dbus_anime);
+        //     }
+        // }
+        if (this.dbus_supported.supported.charge_ctrl.charge_level_set) {
+            if (this._sliderCharge == null) {
+                this._sliderCharge = new SliderChargeLevel(this.dbus_power);
+            }
+        }
+    }
+
+    disable() {
+        if (this._indicateMiniLed != null) {
+            this._indicateMiniLed.destroy();
+            this._indicateMiniLed = null;
+        }
+        if (this._quickMiniLed != null) {
+            this._quickMiniLed.destroy();
+            this._quickMiniLed = null;
+        }
+        if (this._quickPanelOd != null) {
+            this._quickPanelOd.destroy();
+            this._quickPanelOd = null;
+        }
+        if (this._quickAnimePower != null) {
+            this._quickAnimePower.destroy();
+            this._quickAnimePower = null;
+        }
+        if (this._sliderCharge != null) {
+            this._sliderCharge.destroy();
+            this._sliderCharge = null;
+        }
+
+        this.dbus_power.stop();
+        this.dbus_platform.stop();
+        // this.dbus_anime.stop();
+        this.dbus_aura.stop();
+        this.dbus_supported.stop();
+    }
+}

desktop-extensions/gnome-45/src/metadata.json

@@ -0,0 +1,11 @@
+{
+  "name": "asusctl-gnome",
+  "description": "asusctl-gnome a gnome extension exposing some of the base features of asusd in a helpful and easy to use way",
+  "uuid": "asusctl-gnome@asus-linux.org",
+  "uuid-dev": "asusctl-gnome-dev@asus-linux.org",
+  "settings-schema": "org.gnome.shell.extensions.asusctl-gnome",
+  "version": "4.3.2",
+  "shell-version": [
+    "43", "44", "45"
+  ]
+}

desktop-extensions/gnome-45/src/modules/dbus/animatrix.ts

@@ -0,0 +1,119 @@
+import { DbusBase } from "./base";
+import { DeviceState, AnimBooting, Brightness, AnimAwake, AnimSleeping, AnimShutdown } from "../../bindings/anime";
+
+export class AnimeDbus extends DbusBase {
+    deviceState: DeviceState = {
+        display_enabled: false,
+        display_brightness: Brightness.Med,
+        builtin_anims_enabled: false,
+        builtin_anims: {
+            boot: AnimBooting.GlitchConstruction,
+            awake: AnimAwake.BinaryBannerScroll,
+            sleep: AnimSleeping.BannerSwipe,
+            shutdown: AnimShutdown.GlitchOut
+        },
+    };
+
+    // TODO: interface or something to enforce requirement of "sync()" method
+    public notifyAnimeStateSubscribers: any[] = [];
+
+    constructor() {
+        super("org-asuslinux-anime-4", "/org/asuslinux/Anime");
+    }
+
+    public setEnableDisplay(state: boolean | null) {
+        if (this.isRunning()) {
+            try {
+                // if null, toggle the current state
+                state = (state == null ? !this.deviceState.display_enabled : state);
+
+                if (this.deviceState.display_enabled !== state) {
+                    this.deviceState.display_enabled = state;
+                }
+                return this.dbus_proxy.SetEnableDisplaySync(state);
+            } catch (e) {
+                //@ts-ignore
+                log("AniMe DBus set power failed!", e);
+            }
+        }
+    }
+
+    public setPowersaveAnim(state: boolean | null) {
+        if (this.isRunning()) {
+            try {
+                // if null, toggle the current state
+                state = (state == null ? !this.deviceState.builtin_anims_enabled : state);
+
+                if (this.deviceState.builtin_anims_enabled !== state) {
+                    this.deviceState.builtin_anims_enabled = state;
+                }
+                return this.dbus_proxy.SetEnableBuiltinsSync(state);
+            } catch (e) {
+                //@ts-ignore
+                log("AniMe DBus set builtins failed!", e);
+            }
+        }
+    }
+
+    public setBrightness(brightness: Brightness) {
+        if (this.isRunning()) {
+            try {
+                if (this.deviceState.display_brightness !== brightness) {
+                    this.deviceState.display_brightness = brightness;
+                }
+                return this.dbus_proxy.SetBrightnessSync(brightness);
+            } catch (e) {
+                //@ts-ignore
+                log("AniMe DBus set brightness failed!", e);
+            }
+        }
+    }
+
+    _parseData(data: any) {
+        if (data.length > 0) {
+            this.deviceState.display_enabled = data[0];
+            this.deviceState.display_brightness = Brightness[data[1] as Brightness];
+            this.deviceState.builtin_anims_enabled = data[2];
+            this.deviceState.builtin_anims.boot = AnimBooting[data[3][0] as AnimBooting];
+            this.deviceState.builtin_anims.awake = AnimAwake[data[3][1] as AnimAwake];
+            this.deviceState.builtin_anims.sleep = AnimSleeping[data[3][2] as AnimSleeping];
+            this.deviceState.builtin_anims.shutdown = AnimShutdown[data[3][2] as AnimShutdown];
+        }
+    }
+
+    public getDeviceState() {
+        if (this.isRunning()) {
+            try {
+                // janky shit going on with DeviceStateSync
+                this._parseData(this.dbus_proxy.DeviceStateSync());
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch DeviceState!", e);
+            }
+        }
+        return this.deviceState;
+    }
+
+    async start() {
+        await super.start();
+        this.getDeviceState();
+
+        this.dbus_proxy.connectSignal(
+            "NotifyDeviceState",
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (proxy: any = null, name: string, data: string) => {
+                if (proxy) {
+                    // idiot xml parsing mneans the get is not nested while this is
+                    this._parseData(data[0]);
+                    this.notifyAnimeStateSubscribers.forEach(sub => {
+                        sub.sync();
+                    });
+                }
+            }
+        );
+    }
+
+    async stop() {
+        await super.stop();
+    }
+}

desktop-extensions/gnome-45/src/modules/dbus/aura.ts

@@ -0,0 +1,284 @@
+import { AuraDevRog1, AuraDevTuf, AuraDevice, AuraEffect, AuraModeNum, AuraPower, AuraPowerDev, AuraZone, Direction, PowerZones, Speed } from "../../bindings/aura";
+import { DbusBase } from "./base";
+
+export class AuraDbus extends DbusBase {
+    public device: AuraDevice = AuraDevice.Unknown;
+    public current_aura_mode: AuraModeNum = AuraModeNum.Static;
+    public aura_modes: Map<AuraModeNum, AuraEffect> = new Map;
+    public leds_powered: AuraPowerDev = {
+        tuf: [],
+        old_rog: [],
+        rog: {
+            keyboard: {
+                zone: PowerZones.Keyboard,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            logo: {
+                zone: PowerZones.Logo,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            lightbar: {
+                zone: PowerZones.Lightbar,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            lid: {
+                zone: PowerZones.Lid,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+            rear_glow: {
+                zone: PowerZones.RearGlow,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: false
+            },
+        }
+    };
+    // TODO: interface or something to enforce requirement of "sync()" method
+    public notifyAuraModeSubscribers: any[] = [];
+    public notifyAuraPowerSubscribers: any[] = [];
+
+    constructor() {
+        super("org-asuslinux-aura-4", "/org/asuslinux/Aura");
+    }
+
+    public getDevice() {
+        if (this.isRunning()) {
+            try {
+                this.device = AuraDevice[this.dbus_proxy.DeviceTypeSync() as AuraDevice];
+                //@ts-ignore
+                log("LED device: " + this.device);
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch supported functionalities", e);
+            }
+        }
+    }
+
+    _parsePowerStates(data: any[]) {
+        const power: AuraPowerDev = this.leds_powered;
+
+        power.tuf = data[0].map((value: string) => {
+            return AuraDevTuf[value as AuraDevTuf];
+        });
+        power.old_rog = data[1].map((value: string) => {
+            return AuraDevRog1[value as AuraDevRog1];
+        });
+        power.rog = {
+            keyboard: {
+                zone: PowerZones[data[2][0][0] as PowerZones],
+                boot: data[2][0][1],
+                awake: data[2][0][2],
+                sleep: data[2][0][3],
+                shutdown: data[2][0][4]
+            },
+            logo: {
+                zone: PowerZones[data[2][1][0] as PowerZones],
+                boot: data[2][1][1],
+                awake: data[2][1][2],
+                sleep: data[2][1][3],
+                shutdown: data[2][1][4]
+            },
+            lightbar: {
+                zone: PowerZones[data[2][2][0] as PowerZones],
+                boot: data[2][2][1],
+                awake: data[2][2][2],
+                sleep: data[2][2][3],
+                shutdown: data[2][2][4]
+            },
+            lid: {
+                zone: PowerZones[data[2][3][0] as PowerZones],
+                boot: data[2][3][1],
+                awake: data[2][3][2],
+                sleep: data[2][3][3],
+                shutdown: data[2][3][4]
+            },
+            rear_glow: {
+                zone: PowerZones[data[2][4][0] as PowerZones],
+                boot: data[2][4][1],
+                awake: data[2][4][2],
+                sleep: data[2][4][3],
+                shutdown: data[2][4][4]
+            }
+        };
+
+        return power;
+    }
+
+    public getLedPower() {
+        if (this.isRunning()) {
+            try {
+                const data = this.dbus_proxy.LedPowerSync();
+                this.leds_powered = this._parsePowerStates(data);
+                //@ts-ignore
+                log("LED power tuf: " + this.leds_powered.tuf);
+                //@ts-ignore
+                log("LED power x1866: " + this.leds_powered.old_rog);
+                //@ts-ignore
+                log("LED power x19b6: " + this.leds_powered.rog);
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch supported functionalities", e);
+            }
+        }
+    }
+
+    public getLedMode() {
+        if (this.isRunning()) {
+            try {
+                this.current_aura_mode = AuraModeNum[this.dbus_proxy.LedModeSync() as AuraModeNum];
+                //@ts-ignore
+                log("Current LED mode:", this.current_aura_mode);
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch supported functionalities", e);
+            }
+        }
+    }
+
+    public setLedMode(mode: AuraEffect) {
+        if (this.isRunning()) {
+            try {
+                this.dbus_proxy.SetLedModeSync([
+                    mode.mode,
+                    mode.zone,
+                    [mode.colour1.r, mode.colour1.g, mode.colour1.b],
+                    [mode.colour2.r, mode.colour2.g, mode.colour2.b],
+                    mode.speed,
+                    mode.direction]);
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch supported functionalities", e);
+            }
+        }
+    }
+
+    _parseAuraEffect(data: any[]) {
+        const aura: AuraEffect = {
+            mode: AuraModeNum[data[0] as AuraModeNum],
+            zone: AuraZone[data[1] as AuraZone],
+            colour1: {
+                r: parseInt(data[2][0]),
+                g: parseInt(data[2][1]),
+                b: parseInt(data[2][2]),
+            },
+            colour2: {
+                r: parseInt(data[3][0]),
+                g: parseInt(data[3][1]),
+                b: parseInt(data[3][2]),
+            },
+            speed: Speed[data[4] as Speed],
+            direction: Direction[data[5] as Direction],
+        };
+        return aura;
+    }
+
+    // Return a list of the available modes, and the current settings for each
+    public getLedModes() {
+        // {'Breathe': ('Breathe', 'None', (166, 0, 0), (0, 0, 0), 'Med', 'Right'),
+        // 'Comet': ('Comet', 'None', (166, 0, 0), (0, 0, 0), 'Med', 'Right'),
+        // 'Static': ('Static', 'None', (78, 0, 0), (0, 0, 0), 'Med', 'Right'),
+        // 'Strobe': ('Strobe', 'None', (166, 0, 0), (0, 0, 0), 'Med', 'Right')}
+        if (this.isRunning()) {
+            try {
+                const _data = this.dbus_proxy.LedModesSync();
+                for (const key in _data[0]) {
+                    const data = _data[0][key];
+                    const aura: AuraEffect = this._parseAuraEffect(data);
+                    this.aura_modes.set(AuraModeNum[key as AuraModeNum], aura);
+                }
+
+                for (const [key, value] of this.aura_modes) {
+                    //@ts-ignore
+                    log(key, value.zone, value.colour1.r, value.speed, value.direction);
+                }
+
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch supported functionalities", e);
+            }
+        }
+    }
+
+    async start() {
+        try {
+            await super.start();
+            this.getDevice();
+            this.getLedPower();
+            this.getLedMode();
+            this.getLedModes();
+
+            //@ts-ignore
+            log("Current LED mode data:", this.aura_modes.get(this.current_aura_mode)?.speed);
+
+            this.dbus_proxy.connectSignal(
+                "NotifyLed",
+                (proxy: any = null, name: string, data: any) => {
+                    if (proxy) {
+                        const aura: AuraEffect = this._parseAuraEffect(data[0]);
+                        this.current_aura_mode = aura.mode;
+                        this.aura_modes.set(aura.mode, aura);
+                        //@ts-ignore
+                        log("LED data has changed to ", aura.mode, aura.zone, aura.colour1.r, aura.speed, aura.direction);
+                        this.notifyAuraModeSubscribers.forEach(sub => {
+                            sub.sync();
+                        });
+                    }
+                }
+            );
+
+            this.dbus_proxy.connectSignal(
+                "NotifyPowerStates",
+                (proxy: any = null, name: string, data: any) => {
+                    if (proxy) {
+                        const power: AuraPowerDev = this._parsePowerStates(data[0]);
+                        this.leds_powered = power;
+                        switch (this.device) {
+                            case AuraDevice.Tuf:
+                                //@ts-ignore
+                                log("LED power has changed to ", this.leds_powered.tuf);
+                                break;
+                            case AuraDevice.X1854:
+                            case AuraDevice.X1869:
+                            case AuraDevice.X18c6:
+                                //@ts-ignore
+                                log("LED power has changed to ", this.leds_powered.old_rog);
+                                break;
+                            case AuraDevice.X19b6:
+                            case AuraDevice.X1a30:
+                                //@ts-ignore
+                                log("LED power has changed to ", this.leds_powered.rog);
+                                break;
+                            default:
+                                break;
+                        }
+                        //@ts-ignore
+                        log("LED power has changed to ", this.leds_powered.rog);
+                        this.notifyAuraPowerSubscribers.forEach(sub => {
+                            sub.sync();
+                        });
+                    }
+                }
+            );
+        } catch (e) {
+            //@ts-ignore
+            log("Supported DBus initialization failed!", e);
+        }
+    }
+
+    async stop() {
+        await super.stop();
+    }
+}

desktop-extensions/gnome-45/src/modules/dbus/base.ts

@@ -0,0 +1,49 @@
+import * as Resources from "../resources";
+import Gio from 'gi://Gio';
+
+export class DbusBase {
+    dbus_proxy: any = null; // type: Gio.DbusProxy
+    connected = false;
+    xml_resource = "";
+    dbus_path = "";
+
+    constructor(resource: string, dbus_path: string) {
+        this.xml_resource = resource;
+        this.dbus_path = dbus_path;
+    }
+
+    async start() {
+        //@ts-ignore
+        log(`Starting ${this.dbus_path} dbus module`);
+        try {
+            const xml = Resources.File.DBus(this.xml_resource);
+            this.dbus_proxy = new Gio.DBusProxy.makeProxyWrapper(xml)(
+                Gio.DBus.system,
+                "org.asuslinux.Daemon",
+                this.dbus_path,
+            );
+
+            this.connected = true;
+            //@ts-ignore
+            log(`${this.dbus_path} client started successfully.`);
+        } catch (e) {
+            //@ts-ignore
+            logError(`${this.xml_resource} dbus init failed!`, e);
+        }
+    }
+
+    async stop() {
+        //@ts-ignore
+        log(`Stopping ${this.xml_resource} dbus module`);
+
+        if (this.connected) {
+            this.dbus_proxy.destroy();
+            this.connected = false;
+            this.dbus_proxy = null;
+        }
+    }
+
+    isRunning(): boolean {
+        return this.connected;
+    }
+}

desktop-extensions/gnome-45/src/modules/dbus/platform.ts

@@ -0,0 +1,202 @@
+import * as bios from "../../bindings/platform";
+import { DbusBase } from "./base";
+
+// TODO: add callbacks for notifications
+export class Platform extends DbusBase {
+    bios: bios.RogBiosSupportedFunctions = {
+        post_sound: false,
+        gpu_mux: false,
+        panel_overdrive: false,
+        dgpu_disable: false,
+        egpu_enable: false,
+        mini_led_mode: false
+    };
+
+    // TODO: interface or something to enforce requirement of "sync()" method
+    public notifyPanelOdSubscribers: any[] = [];
+    public notifyPostBootSoundSubscribers: any[] = [];
+    public notifyMiniLedSubscribers: any[] = [];
+    public notifyGpuMuxSubscribers: any[] = [];
+
+    constructor() {
+        super("org-asuslinux-platform-4", "/org/asuslinux/Platform");
+    }
+
+    public getPostBootSound() {
+        if (this.isRunning()) {
+            try {
+                this.bios.post_sound = this.dbus_proxy.PostBootSoundSync() == "true" ? true : false;
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to get POST Boot Sound state!", e);
+            }
+        }
+        return this.bios.post_sound;
+    }
+
+    public setPostBootSound(state: boolean) {
+        if (this.isRunning()) {
+            try {
+                if (state !== this.bios.post_sound) {
+                    this.bios.post_sound = state;
+                }
+                return this.dbus_proxy.SetPostBootSoundSync(state);
+            } catch (e) {
+                //@ts-ignore
+                log("Platform DBus set Post Boot Sound failed!", e);
+            }
+        }
+    }
+
+    public getGpuMuxMode() {
+        if (this.isRunning()) {
+            try {
+                this.bios.gpu_mux = this.dbus_proxy.GpuMuxModeSync() == "true" ? true : false;
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to get MUX state!", e);
+            }
+        }
+        return this.bios.gpu_mux;
+    }
+
+    public setGpuMuxMode(state: boolean) {
+        if (this.isRunning()) {
+            try {
+                if (!state !== this.bios.gpu_mux) {
+                    this.bios.gpu_mux = !state;
+                }
+                return this.dbus_proxy.SetGpuMuxModeSync(!state);
+            } catch (e) {
+                //@ts-ignore
+                log("Switching the MUX failed!", e);
+            }
+        }
+    }
+
+    public getPanelOd() {
+        if (this.isRunning()) {
+            try {
+                this.bios.panel_overdrive = this.dbus_proxy.PanelOdSync() == "true" ? true : false;
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to get Overdrive state!", e);
+            }
+        }
+        return this.bios.panel_overdrive;
+    }
+
+    public setPanelOd(state: boolean) {
+        if (this.isRunning()) {
+            try {
+                if (state !== this.bios.panel_overdrive) {
+                    this.bios.panel_overdrive = state;
+                }
+                return this.dbus_proxy.SetPanelOdSync(state);
+            } catch (e) {
+                //@ts-ignore
+                log("Overdrive DBus set overdrive state failed!", e);
+            }
+        }
+    }
+
+    public getMiniLedMode() {
+        if (this.isRunning()) {
+            try {
+                this.bios.mini_led_mode = this.dbus_proxy.MiniLedModeSync() == "true" ? true : false;
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to get Overdrive state!", e);
+            }
+        }
+        return this.bios.mini_led_mode;
+    }
+
+    public setMiniLedMode(state: boolean) {
+        if (this.isRunning()) {
+            try {
+                if (state !== this.bios.mini_led_mode) {
+                    this.bios.mini_led_mode = state;
+                }
+                return this.dbus_proxy.SetMiniLedModeSync(state);
+            } catch (e) {
+                //@ts-ignore
+                log("setMiniLedMode failed!", e);
+            }
+        }
+    }
+
+    async start() {
+        try {
+            await super.start();
+
+            this.getPostBootSound();
+            this.dbus_proxy.connectSignal(
+                "NotifyPostBootSound",
+                (proxy: any = null, _name: string, data: boolean) => {
+                    if (proxy) {
+                        //@ts-ignore
+                        log(`PostBootSound changed to ${data}`);
+                        this.notifyPostBootSoundSubscribers.forEach(sub => {
+                            sub.sync();
+                        });
+                    }
+                }
+            );
+
+            this.getPanelOd();
+            this.dbus_proxy.connectSignal(
+                "NotifyPanelOd",
+                (proxy: any = null, _name: string, data: boolean) => {
+                    if (proxy) {
+                        //@ts-ignore
+                        log(`NotifyPanelOd has changed to ${data}.`);
+                        this.notifyPanelOdSubscribers.forEach(sub => {
+                            sub.sync();
+                        });
+                    }
+                }
+            );
+
+            this.getMiniLedMode();
+            this.dbus_proxy.connectSignal(
+                "NotifyMiniLedMode",
+                (proxy: any = null, _name: string, data: boolean) => {
+                    if (proxy) {
+                        //@ts-ignore
+                        log(`MiniLedMode has changed to ${data}.`);
+                        this.notifyMiniLedSubscribers.forEach(sub => {
+                            sub.sync();
+                        });
+                    }
+                }
+            );
+
+            this.getGpuMuxMode();
+            this.dbus_proxy.connectSignal(
+                "NotifyGpuMuxMode",
+                (proxy: any = null, _name: string, data: boolean) => {
+                    if (proxy) {
+                        //@ts-ignore
+                        log(`MUX has changed to ${data}.`);
+                        this.notifyGpuMuxSubscribers.forEach(sub => {
+                            sub.sync();
+                        });
+                    }
+                }
+            );
+
+        } catch (e) {
+            //@ts-ignore
+            log("Platform DBus init failed!", e);
+        }
+    }
+
+    async stop() {
+        await super.stop();
+        this.bios.post_sound = false;
+        this.bios.panel_overdrive = false;
+        this.bios.mini_led_mode = false;
+        this.bios.gpu_mux = false;
+    }
+}

desktop-extensions/gnome-45/src/modules/dbus/power.ts

@@ -0,0 +1,99 @@
+import { DbusBase } from "./base";
+
+// function getMethods(obj: { [x: string]: { toString: () => string; }; }) {
+//     var result = [];
+//     for (var id in obj) {
+//       try {
+//         if (typeof(obj[id]) == "function") {
+//           result.push(id + ": " + obj[id].toString());
+//         }
+//       } catch (err) {
+//         result.push(id + ": inaccessible");
+//       }
+//     }
+//     return result;
+//   }
+
+export class Power extends DbusBase {
+    chargeLimit = 100;
+    mainsOnline = false;
+
+    constructor() {
+        super("org-asuslinux-power-4", "/org/asuslinux/Power");
+    }
+
+    public getChargingLimit() {
+        if (this.isRunning()) {
+            try {
+                this.chargeLimit = this.dbus_proxy.ChargeControlEndThresholdSync();
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch Charging Limit!", e);
+            }
+        }
+        return this.chargeLimit;
+    }
+
+    public setChargingLimit(limit: number) {
+        if (this.isRunning()) {
+            try {
+                if (limit > 0 && this.chargeLimit !== limit) {
+                    // update state
+                    this.chargeLimit = limit;
+                }
+                return this.dbus_proxy.SetChargeControlEndThresholdSync(limit);
+            } catch (e) {
+                //@ts-ignore
+                log("Profile DBus set power profile failed!", e);
+            }
+        }
+    }
+
+    public getMainsOnline() {
+        if (this.isRunning()) {
+            try {
+                this.mainsOnline = this.dbus_proxy.MainsOnlineSync();
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch MainsLonline!", e);
+            }
+        }
+        return this.mainsOnline;
+    }
+
+    async start() {
+        try {
+            await super.start();
+            this.getChargingLimit();
+
+            this.dbus_proxy.connectSignal(
+                "NotifyChargeControlEndThreshold",
+                (proxy: any = null, name: string, data: string) => {
+                    if (proxy) {
+                        //@ts-ignore
+                        log(`Charging Limit has changed to ${data}% (${name}).`);
+                        this.chargeLimit = parseInt(data);
+                    }
+                }
+            );
+
+            this.dbus_proxy.connectSignal(
+                "NotifyMainsOnline",
+                (proxy: any = null, name: string, data: string) => {
+                    if (proxy) {
+                        //@ts-ignore
+                        log(`NotifyMainsOnline has changed to ${data}% (${name}).`);
+                        this.mainsOnline = parseInt(data) == 1 ? true : false;
+                    }
+                }
+            );
+        } catch (e) {
+            //@ts-ignore
+            log("Charging Limit DBus initialization failed!", e);
+        }
+    }
+
+    async stop() {
+        await super.stop();
+    }
+}

desktop-extensions/gnome-45/src/modules/dbus/supported.ts

@@ -0,0 +1,107 @@
+import { SupportedFunctions, AdvancedAura } from "../../bindings/platform";
+import { AuraDevice, AuraModeNum, AuraZone, PowerZones } from "../../bindings/aura";
+import { DbusBase } from "./base";
+
+export class Supported extends DbusBase {
+    // False,
+    // (True,),
+    // (True, True),
+    //   ('X19b6',
+    //   True,
+    //   ['Static',
+    //   'Breathe',
+    //   'Strobe',
+    //   'Rainbow',
+    //   'Star',
+    //   'Rain',
+    //   'Highlight',
+    //   'Laser',
+    //   'Ripple',
+    //   'Pulse',
+    //   'Comet',
+    //   'Flash'],
+    //   [],
+    //   'PerKey',
+    //   ['Keyboard', 'Lightbar', 'Logo', 'RearGlow']),
+    // (False, True, True, True, False, True)
+
+    supported: SupportedFunctions = {
+        anime_ctrl: false,
+        charge_ctrl: {
+            charge_level_set: false
+        },
+        platform_profile: {
+            platform_profile: false,
+            fan_curves: false
+        },
+        keyboard_led: {
+            dev_id: AuraDevice.Unknown,
+            brightness: false,
+            basic_modes: [],
+            basic_zones: [],
+            advanced_type: AdvancedAura.None,
+            power_zones: [],
+        },
+        rog_bios_ctrl: {
+            post_sound: false,
+            gpu_mux: false,
+            panel_overdrive: false,
+            dgpu_disable: false,
+            egpu_enable: false,
+            mini_led_mode: false
+        }
+    };
+
+    constructor() {
+        super("org-asuslinux-supported-4", "/org/asuslinux/Supported");
+    }
+
+    public getSupported() {
+        if (this.isRunning()) {
+            try {
+                const _data = this.dbus_proxy.SupportedFunctionsSync();
+                this.supported.anime_ctrl = _data[0];
+                this.supported.charge_ctrl.charge_level_set = _data[1];
+                this.supported.platform_profile.platform_profile = _data[2][0];
+                this.supported.platform_profile.fan_curves = _data[2][1];
+                this.supported.keyboard_led.dev_id = AuraDevice[_data[3][0] as AuraDevice];
+                this.supported.keyboard_led.brightness = _data[3][1];
+
+                this.supported.keyboard_led.basic_modes = _data[3][2].map(function (value: string) {
+                    return AuraModeNum[value as AuraModeNum];
+                });
+                this.supported.keyboard_led.basic_zones = _data[3][3].map(function (value: string) {
+                    return AuraZone[value as AuraZone];
+                });
+                this.supported.keyboard_led.advanced_type = AdvancedAura[_data[3][4] as AdvancedAura];
+                this.supported.keyboard_led.power_zones = _data[3][5].map(function (value: string) {
+                    return PowerZones[value as PowerZones];
+                });
+
+                this.supported.rog_bios_ctrl.post_sound = _data[4][0];
+                this.supported.rog_bios_ctrl.gpu_mux = _data[4][1];
+                this.supported.rog_bios_ctrl.panel_overdrive = _data[4][2];
+                this.supported.rog_bios_ctrl.dgpu_disable = _data[4][3];
+                this.supported.rog_bios_ctrl.egpu_enable = _data[4][4];
+                this.supported.rog_bios_ctrl.mini_led_mode = _data[4][5];
+            } catch (e) {
+                //@ts-ignore
+                log("Failed to fetch supported functionalities", e);
+            }
+        }
+    }
+
+    async start() {
+        try {
+            await super.start();
+            this.getSupported();
+        } catch (e) {
+            //@ts-ignore
+            log("Supported DBus initialization failed!", e);
+        }
+    }
+
+    async stop() {
+        await super.stop();
+    }
+}

desktop-extensions/gnome-45/src/modules/helpers.ts

@@ -0,0 +1,14 @@
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import {QuickSettingsMenu, QuickToggle } from 'resource:///org/gnome/shell/ui/quickSettings.js';
+
+export function addQuickSettingsItems(items: [typeof QuickToggle], width = 1) {
+    const QuickSettingsMenu = Main.panel.statusArea.quickSettings;
+    // Add the items with the built-in function
+    QuickSettingsMenu._addItems(items, width);
+
+    // Ensure the tile(s) are above the background apps menu
+    for (const item of items) {
+        QuickSettingsMenu.menu._grid.set_child_below_sibling(item,
+            QuickSettingsMenu._backgroundApps.quickSettingsItems[0]);
+    }
+}

desktop-extensions/gnome-45/src/modules/indicators/gpu_status.ts

@@ -0,0 +1,22 @@
+import GObject from 'gi://GObject';
+import {QuickSettingsMenu, SystemIndicator} from 'resource:///org/gnome/shell/ui/quickSettings.js';
+
+export const IndicateGpuStatus = GObject.registerClass(
+    class IndicateGpuStatus extends SystemIndicator {
+        constructor() {
+            super();
+
+            // Create the icon for the indicator
+            this._indicator = this._addIndicator();
+            this._indicator.icon_name = "selection-mode-symbolic";
+            this._indicator.visible = true;
+
+            this.sync();
+            // Add the indicator to the panel and the toggle to the menu
+            QuickSettingsMenu._indicators.add_child(this);
+        }
+
+        sync() {
+            // TODO:
+        }
+    });

desktop-extensions/gnome-45/src/modules/indicators/mini_led.ts

@@ -0,0 +1,23 @@
+import Gio from 'gi://Gio';
+import GObject from 'gi://GObject';
+import * as AsusExtension from '../../extension';
+import {QuickSettingsMenu, SystemIndicator} from 'resource:///org/gnome/shell/ui/quickSettings.js';
+
+export const IndicateMiniLed = GObject.registerClass(
+    class IndicateMiniLed extends SystemIndicator {
+        constructor() {
+            super();
+
+            // Create the icon for the indicator
+            this._indicator = this._addIndicator();
+            this._indicator.icon_name = "selection-mode-symbolic";
+
+            // Showing the indicator when the feature is enabled
+            AsusExtension.extension._settings.bind("mini-led-enabled",
+                this._indicator, "visible",
+                Gio.SettingsBindFlags.DEFAULT);
+
+            // Add the indicator to the panel and the toggle to the menu
+            QuickSettingsMenu._indicators.add_child(this);
+        }
+    });

desktop-extensions/gnome-45/src/modules/menu_toggles/anime.ts

@@ -0,0 +1,79 @@
+import { AnimeDbus } from "../dbus/animatrix";
+
+import GObject from 'gi://GObject';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+
+export const MenuToggleAnimePower = GObject.registerClass(
+    class MenuToggleAnimePower extends PopupMenu.PopupSwitchMenuItem {
+        private _dbus_anime: AnimeDbus;
+        public toggle_callback = () => {};
+
+        constructor(dbus_anime: AnimeDbus) {
+            super(
+                "AniMatrix Display Power", dbus_anime.deviceState.display_enabled
+            );
+            this._dbus_anime = dbus_anime;
+            this.label = "AniMatrix Display Power";
+
+            this.connectObject(
+                "toggled", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            this.sync();
+        }
+
+        _toggleMode() {
+            this._dbus_anime.getDeviceState();
+            if (this.state !== this._dbus_anime.deviceState.display_enabled)
+                this._dbus_anime.setEnableDisplay(this.state);
+            this.toggle_callback();
+        }
+
+        sync() {
+            this._dbus_anime.getDeviceState();
+            const checked = this._dbus_anime.deviceState.display_enabled;
+            this.setToggleState(checked);
+        }
+    });
+
+
+export const MenuToggleAnimeBuiltins = GObject.registerClass(
+    class MenuToggleAnimeBuiltins extends PopupMenu.PopupSwitchMenuItem {
+        private _dbus_anime: AnimeDbus;
+        public toggle_callback = () => {};
+
+        constructor(dbus_anime: AnimeDbus) {
+            super(
+                "AniMatrix Powersave Animation", dbus_anime.deviceState.builtin_anims_enabled
+            );
+            this._dbus_anime = dbus_anime;
+            this.label = "AniMatrix Powersave Animation";
+
+            this.connectObject(
+                "toggled", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            this.sync();
+        }
+
+        _toggleMode() {
+            this._dbus_anime.getDeviceState();
+            if (this.state !== this._dbus_anime.deviceState.builtin_anims_enabled)
+                this._dbus_anime.setPowersaveAnim(this.state);
+            this.toggle_callback();
+        }
+
+        sync() {
+            this._dbus_anime.getDeviceState();
+            const checked = this._dbus_anime.deviceState.display_enabled;
+            this.setToggleState(checked);
+        }
+    });

desktop-extensions/gnome-45/src/modules/menu_toggles/mini_led.ts

@@ -0,0 +1,40 @@
+import { Platform } from "../dbus/platform";
+import GObject from 'gi://GObject';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+
+export const MenuToggleMiniLed = GObject.registerClass(
+    class MenuToggleMiniLed extends PopupMenu.PopupSwitchMenuItem {
+        private _dbus_platform: Platform;
+        public toggle_callback = () => {};
+
+        constructor(dbus_platform: Platform) {
+            super("MiniLED", dbus_platform.bios.mini_led_mode);
+
+            this._dbus_platform = dbus_platform;
+            this.label = "MiniLED";
+
+            this.connectObject(
+                "toggled", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            this.sync();
+        }
+
+        _toggleMode() {
+            this._dbus_platform.getMiniLedMode();
+            const state = this._dbus_platform.bios.mini_led_mode;
+            if (this.state !== state)
+                this._dbus_platform.setMiniLedMode(this.state);
+            this.toggle_callback();
+        }
+
+        sync() {
+            this._dbus_platform.getMiniLedMode();
+            const toggled = this._dbus_platform.bios.mini_led_mode;
+            this.setToggleState(toggled);
+        }
+    });

desktop-extensions/gnome-45/src/modules/menu_toggles/panel_od.ts

@@ -0,0 +1,41 @@
+import { Platform } from "../dbus/platform";
+
+import GObject from 'gi://GObject';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+
+export const MenuTogglePanelOd = GObject.registerClass(
+    class MenuTogglePanelOd extends PopupMenu.PopupSwitchMenuItem {
+        private _dbus_platform: Platform;
+        public toggle_callback = () => {};
+
+        constructor(dbus_platform: Platform) {
+            super("Panel Overdrive", dbus_platform.bios.panel_overdrive);
+
+            this._dbus_platform = dbus_platform;
+            this.label = "Panel Overdrive";
+
+            this.connectObject(
+                "toggled", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            this.sync();
+        }
+
+        _toggleMode() {
+            this._dbus_platform.getPanelOd();
+            const state = this._dbus_platform.bios.panel_overdrive;
+            if (this.state !== state)
+                this._dbus_platform.setPanelOd(this.state);
+            this.toggle_callback();
+        }
+
+        sync() {
+            this._dbus_platform.getPanelOd();
+            const toggled = this._dbus_platform.bios.panel_overdrive;
+            this.setToggleState(toggled);
+        }
+    });

desktop-extensions/gnome-45/src/modules/quick_menus/aura.ts

@@ -0,0 +1,77 @@
+import { addQuickSettingsItems } from "../helpers";
+import { AuraDbus } from "../dbus/aura";
+import { AuraEffect, AuraModeNum } from "../../bindings/aura";
+import GObject from 'gi://GObject';
+
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import * as QuickSettings from 'resource:///org/gnome/shell/ui/quickSettings.js';
+
+export const AuraMenuToggle = GObject.registerClass(
+    class AuraMenuToggle extends QuickSettings.QuickMenuToggle {
+        private _dbus_aura: AuraDbus;
+        private _last_mode: AuraModeNum = AuraModeNum.Static;
+
+        constructor(dbus_aura: AuraDbus) {
+            super({
+                title: "Aura Modes",
+                iconName: "selection-mode-symbolic",
+                toggleMode: true,
+            });
+            this._dbus_aura = dbus_aura;
+
+            this.connectObject(
+                this);
+
+            this.menu.setHeader("selection-mode-symbolic", this._dbus_aura.current_aura_mode);
+
+            this._itemsSection = new PopupMenu.PopupMenuSection();
+
+            this._dbus_aura.aura_modes.forEach((mode, key) => {
+                this._itemsSection.addAction(key, () => {
+                    this._dbus_aura.setLedMode(mode);
+                    this.sync();
+                }, "");
+            });
+
+            this.menu.addMenuItem(this._itemsSection);
+
+            // Add an entry-point for more settings
+            // this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+            // const settingsItem = this.menu.addAction("More Settings",
+            //     () => ExtensionUtils.openPrefs());
+            // // Ensure the settings are unavailable when the screen is locked
+            // settingsItem.visible = Main.sessionMode.allowSettings;
+            // this.menu._settingsActions[Me.uuid] = settingsItem;
+
+            this.connectObject(
+                "clicked", () => {
+                    let mode: AuraEffect | undefined;
+                    if (this._dbus_aura.current_aura_mode == AuraModeNum.Static) {
+                        mode = this._dbus_aura.aura_modes.get(this._last_mode);
+                    } else {
+                        mode = this._dbus_aura.aura_modes.get(AuraModeNum.Static);
+                    }
+                    if (mode != undefined) {
+                        this._dbus_aura.setLedMode(mode);
+                        this.sync();
+                    }
+                },
+                this);
+
+            this._dbus_aura.notifyAuraModeSubscribers.push(this);
+            this.sync();
+
+            addQuickSettingsItems([this]);
+        }
+
+        sync() {
+            const checked = this._dbus_aura.current_aura_mode != AuraModeNum.Static;
+            this.title = this._dbus_aura.current_aura_mode;
+            if (this._last_mode != this._dbus_aura.current_aura_mode && this._dbus_aura.current_aura_mode != AuraModeNum.Static) {
+                this._last_mode = this._dbus_aura.current_aura_mode;
+            }
+
+            if (this.checked !== checked)
+                this.set({ checked });
+        }
+    });

desktop-extensions/gnome-45/src/modules/quick_menus/laptop_features.ts

@@ -0,0 +1,169 @@
+import { AnimeDbus } from "../dbus/animatrix";
+import { Supported } from "../dbus/supported";
+import { Platform } from "../dbus/platform";
+
+import { addQuickSettingsItems } from "../helpers";
+import { MenuToggleAnimeBuiltins, MenuToggleAnimePower } from "../menu_toggles/anime";
+import { MenuTogglePanelOd } from "../menu_toggles/panel_od";
+import { MenuToggleMiniLed } from "../menu_toggles/mini_led";
+
+import GObject from 'gi://GObject';
+
+import * as AsusExtension from "../../extension";
+// import {PopupMenu, PopupMenuSection} from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import {QuickMenuToggle} from 'resource:///org/gnome/shell/ui/quickSettings.js';
+
+export const FeatureMenuToggle = GObject.registerClass(
+    class FeatureMenuToggle extends QuickMenuToggle {
+        private _dbus_supported: Supported;
+        private _dbus_platform: Platform;
+        private _dbus_anime: AnimeDbus;
+
+        public miniLed: typeof MenuToggleMiniLed;
+        public panelOd: typeof MenuTogglePanelOd;
+        public animeDisplayPower: typeof MenuToggleAnimePower;
+        public animePowersaveAnim: typeof MenuToggleAnimeBuiltins;
+        private primary = "mini-led";
+
+        constructor(dbus_supported: Supported, dbus_platform: Platform, dbus_anime: AnimeDbus) {
+            super({
+                title: "Laptop",
+                iconName: "selection-mode-symbolic",
+                toggleMode: true,
+            });
+            this._dbus_supported = dbus_supported;
+            this._dbus_platform = dbus_platform;
+            this._dbus_anime = dbus_anime;
+
+            this.menu.setHeader("selection-mode-symbolic", "Laptop features");
+
+            this.primary =  AsusExtension.extension._settings.get_string("primary-quickmenu-toggle");
+
+            // TODO: temporary block
+            if (this.primary == "mini-led" && !this._dbus_supported.supported.rog_bios_ctrl.mini_led_mode) {
+                this.primary = "panel-od";
+            } else if (this.primary == "panel-od" && !this._dbus_supported.supported.rog_bios_ctrl.panel_overdrive) {
+                this.primary = "anime-power";
+            } else if (this.primary == "anime-power" && !this._dbus_supported.supported.anime_ctrl) {
+                this.primary = "mini-led";
+            } else if (this.primary.length == 0) {
+                this.primary = "panel-od";
+            }
+
+            // AsusExtension.extension._settings.connect('changed::primary-quickmenu-toggle', this.sync);
+            AsusExtension.extension._settings.set_string("primary-quickmenu-toggle", this.primary);
+
+            this._itemsSection = new PopupMenu.PopupMenuSection();
+            if (this._dbus_supported.supported.rog_bios_ctrl.mini_led_mode) {
+                if (this.miniLed == null) {
+                    this.miniLed = new MenuToggleMiniLed(this._dbus_platform);
+                    this._dbus_platform.notifyMiniLedSubscribers.push(this.miniLed);
+                    this._itemsSection.addMenuItem(this.miniLed, 0);
+                    this._dbus_platform.notifyMiniLedSubscribers.push(this);
+                    this.miniLed.toggle_callback = () => {
+                        this.primary = "mini-led";
+                        this.sync();
+                    }
+                }
+            }
+
+            if (this._dbus_supported.supported.rog_bios_ctrl.panel_overdrive) {
+                if (this.panelOd == null) {
+                    this.panelOd = new MenuTogglePanelOd(this._dbus_platform);
+                    this._dbus_platform.notifyPanelOdSubscribers.push(this.panelOd);
+                    this._itemsSection.addMenuItem(this.panelOd, 1);
+                    this._dbus_platform.notifyPanelOdSubscribers.push(this);
+                    this.panelOd.toggle_callback = () => {
+                        this.primary = "panel-od";
+                        this.sync();
+                    }
+                }
+            }
+
+            if (this._dbus_supported.supported.anime_ctrl) {
+                if (this.animeDisplayPower == null) {
+                    this.animeDisplayPower = new MenuToggleAnimePower(this._dbus_anime);
+                    this._dbus_anime.notifyAnimeStateSubscribers.push(this.animeDisplayPower);
+                    this._itemsSection.addMenuItem(this.animeDisplayPower, 2);
+                    this._dbus_anime.notifyAnimeStateSubscribers.push(this);
+                    this.animeDisplayPower.toggle_callback = () => {
+                        this.primary = "anime-power";
+                        this.sync();
+                    }
+                }
+
+                if (this.animePowersaveAnim == null) {
+                    this.animePowersaveAnim = new MenuToggleAnimeBuiltins(this._dbus_anime);
+                    this._dbus_anime.notifyAnimeStateSubscribers.push(this.animePowersaveAnim);
+                    this._itemsSection.addMenuItem(this.animePowersaveAnim, 3);
+                }
+            }
+
+            this.connectObject(
+                "clicked", () => {
+                    this._toggle();
+                },
+                this);
+
+            this.menu.addMenuItem(this._itemsSection, 0);
+
+            // // Add an entry-point for more extension._settings
+            // this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+            // const settingsItem = this.menu.addAction("More Settings",
+            //     () => ExtensionUtils.openPrefs());
+            // // Ensure the extension._settings are unavailable when the screen is locked
+            // settingsItem.visible = Main.sessionMode.allowSettings;
+            // this.menu._settingsActions[Me.uuid] = settingsItem;
+
+            this.sync();
+            addQuickSettingsItems([this]);
+        }
+
+        _toggle() {
+            if (this.primary == "mini-led" && this.miniLed != null) {
+                this._dbus_platform.getMiniLedMode();
+                const checked = this._dbus_platform.bios.mini_led_mode;
+                if (this.checked !== checked)
+                    this._dbus_platform.setMiniLedMode(this.checked);
+            }
+
+            if (this.primary == "panel-od" && this.panelOd != null) {
+                this._dbus_platform.getPanelOd();
+                const checked = this._dbus_platform.bios.panel_overdrive;
+                if (this.checked !== checked)
+                    this._dbus_platform.setPanelOd(this.checked);
+            }
+
+            if (this.primary == "anime-power" && this.animeDisplayPower != null) {
+                this._dbus_anime.getDeviceState();
+                const checked = this._dbus_anime.deviceState.display_enabled;
+                if (this.checked !== checked)
+                    this._dbus_anime.setEnableDisplay(this.checked);
+            }
+        }
+
+        sync() {
+            let checked = false;
+            if (this.primary == "mini-led" && this.miniLed != null) {
+                this.title = this.miniLed.label;
+                checked = this._dbus_platform.bios.mini_led_mode;
+            }
+
+            if (this.primary == "panel-od" && this.panelOd != null) {
+                this.title = this.panelOd.label;
+                checked = this._dbus_platform.bios.panel_overdrive;
+            }
+
+            if (this.primary == "anime-power" && this.animeDisplayPower != null) {
+                this.title = this.animeDisplayPower.label;
+                checked = this._dbus_anime.deviceState.display_enabled;
+            }
+
+            // if (this.animePowersaveAnim != null) {
+            // }
+
+            if (this.checked !== checked)
+                this.set({ checked });
+        }
+    });

desktop-extensions/gnome-45/src/modules/quick_toggles/anime_power.ts

@@ -0,0 +1,53 @@
+import { AnimeDbus } from "../dbus/animatrix";
+import { addQuickSettingsItems } from "../helpers";
+
+import Gio from 'gi://Gio';
+import GObject from 'gi://GObject';
+import * as QuickToggle from 'resource:///org/gnome/shell/ui/quickSettings.js';
+
+import * as AsusExtension from "../../extension.js";
+
+export const QuickAnimePower = GObject.registerClass(
+    class QuickAnimePower extends QuickToggle {
+        private _dbus_anime: AnimeDbus;
+
+        constructor(dbus_anime: AnimeDbus) {
+            super({
+                title: "AniMatrix Power",
+                iconName: "selection-mode-symbolic",
+                toggleMode: true,
+            });
+            this._dbus_anime = dbus_anime;
+            this.label = "AniMatrix Power";
+
+            this.connectObject(
+                "clicked", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            AsusExtension.extension._settings.bind("anime-power",
+                this, "checked",
+                Gio.SettingsBindFlags.DEFAULT);
+
+            this.sync();
+
+            addQuickSettingsItems([this]);
+        }
+
+        _toggleMode() {
+            this._dbus_anime.getDeviceState();
+            const checked = this._dbus_anime.deviceState.display_enabled;
+            if (this.checked !== checked)
+                this._dbus_anime.setEnableDisplay(this.checked);
+        }
+
+        sync() {
+            this._dbus_anime.getDeviceState();
+            const checked = this._dbus_anime.deviceState.display_enabled;
+            if (this.checked !== checked)
+                this.set({ checked });
+        }
+    });

desktop-extensions/gnome-45/src/modules/quick_toggles/mini_led.ts

@@ -0,0 +1,50 @@
+import { Platform } from "../dbus/platform";
+import { addQuickSettingsItems } from "../helpers";
+import Gio from 'gi://Gio';
+import GObject from 'gi://GObject';
+import * as QuickToggle from 'resource:///org/gnome/shell/ui/quickSettings.js';
+import * as AsusExtension from "../../extension.js";
+
+export const QuickMiniLed = GObject.registerClass(
+    class QuickMiniLed extends QuickToggle {
+        private _dbus_platform: Platform;
+
+        constructor(dbus_platform: Platform) {
+            super({
+                title: "MiniLED",
+                iconName: "selection-mode-symbolic",
+                toggleMode: true,
+            });
+            this._dbus_platform = dbus_platform;
+            this.label = "MiniLED";
+
+            this.connectObject(
+                "destroy", () =>  AsusExtension.extension._settings.run_dispose(),
+                "clicked", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            AsusExtension.extension._settings.bind("mini-led-enabled",
+                this, "checked",
+                Gio.SettingsBindFlags.DEFAULT);
+
+            this.sync();
+
+            addQuickSettingsItems([this]);
+        }
+
+        _toggleMode() {
+            const checked = this._dbus_platform.getMiniLedMode();
+            if (this.checked !== checked)
+                this._dbus_platform.setMiniLedMode(this.checked);
+        }
+
+        sync() {
+            const checked = this._dbus_platform.getMiniLedMode();
+            if (this.checked !== checked)
+                this.set({ checked });
+        }
+    });

desktop-extensions/gnome-45/src/modules/quick_toggles/panel_od.ts

@@ -0,0 +1,49 @@
+import { Platform } from "../dbus/platform";
+import { addQuickSettingsItems } from "../helpers";
+import Gio from 'gi://Gio';
+import GObject from 'gi://GObject';
+import * as QuickToggle from 'resource:///org/gnome/shell/ui/quickSettings.js';
+import * as AsusExtension from "../../extension.js";
+
+export const QuickPanelOd = GObject.registerClass(
+    class QuickPanelOd extends QuickToggle {
+        private _dbus_platform: Platform;
+
+        constructor(dbus_platform: Platform) {
+            super({
+                title: "Panel Overdrive",
+                iconName: "selection-mode-symbolic",
+                toggleMode: true,
+            });
+            this._dbus_platform = dbus_platform;
+            this.label = "Panel Overdrive";
+
+            this.connectObject(
+                "clicked", () => this._toggleMode(),
+                this);
+
+            this.connect("destroy", () => {
+                this.destroy();
+            });
+
+            AsusExtension.extension._settings.bind("panel-od-enabled",
+                this, "checked",
+                Gio.SettingsBindFlags.DEFAULT);
+
+            this.sync();
+
+            addQuickSettingsItems([this]);
+        }
+
+        _toggleMode() {
+            const checked = this._dbus_platform.getPanelOd();
+            if (this.checked !== checked)
+                this._dbus_platform.setPanelOd(this.checked);
+        }
+
+        sync() {
+            const checked = this._dbus_platform.getPanelOd();
+            if (this.checked !== checked)
+                this.set({ checked });
+        }
+    });

desktop-extensions/gnome-45/src/modules/resources.ts

@@ -0,0 +1,20 @@
+import GLib from 'gi://GLib';
+import * as AsusExtension from '../extension.js';
+
+export class File {
+    public static DBus(name: string) {
+        const file = `${AsusExtension.extension.path}/resources/dbus/${name}.xml`;
+        try {
+            const [_ok, bytes] = GLib.file_get_contents(file);
+            if (!_ok)
+            //@ts-ignore
+                log(`Couldn't read contents of "${file}"`);
+
+            const decoder = new TextDecoder();
+            return _ok ? decoder.decode(bytes) : null;
+        } catch (e) {
+            //@ts-ignore
+            log(`Failed to load "${file}"`, e);
+        }
+    }
+}

desktop-extensions/gnome-45/src/modules/sliders/charge.ts

@@ -0,0 +1,56 @@
+import { Power } from "../dbus/power";
+import { addQuickSettingsItems } from "../helpers";
+import GObject from 'gi://GObject';
+import * as QuickSettings from 'resource:///org/gnome/shell/ui/quickSettings.js';
+import * as AsusExtension from "../../extension.js";
+
+export const SliderChargeLevel = GObject.registerClass(
+    class SliderChargeLevel extends QuickSettings.QuickSlider {
+        private _dbus_power: Power;
+
+        constructor(dbus_power: Power) {
+            super({
+                iconName: "selection-mode-symbolic",
+            });
+            this._dbus_power = dbus_power;
+
+            this._sliderChangedId = this.slider.connect("drag-end",
+                this._onSliderChanged.bind(this));
+
+            // Binding the slider to a GSettings key
+
+            AsusExtension.extension._settings.connect("changed::charge-level",
+                this._onSettingsChanged.bind(this));
+
+            // Set an accessible name for the slider
+            this.slider.accessible_name = "Charge level";
+
+            this._sync();
+            this._onSettingsChanged();
+
+            addQuickSettingsItems([this], 2);
+        }
+
+        _onSettingsChanged() {
+            // Prevent the slider from emitting a change signal while being updated
+            this.slider.block_signal_handler(this._sliderChangedId);
+            this.slider.value =  AsusExtension.extension._settings.get_uint("charge-level") / 100.0;
+            this.slider.unblock_signal_handler(this._sliderChangedId);
+        }
+
+        _onSliderChanged() {
+            // Assuming our GSettings holds values between 0..100, adjust for the
+            // slider taking values between 0..1
+            const percent = Math.floor(this.slider.value * 100);
+            const stored = Math.floor( AsusExtension.extension._settings.get_uint("charge-level") / 100.0);
+            if (this.slider.value !== stored)
+                this._dbus_power.setChargingLimit(percent);
+                AsusExtension.extension._settings.set_uint("charge-level", percent);
+        }
+
+        _sync() {
+            const value = this._dbus_power.getChargingLimit();
+            if (this.slider.value !== value / 100)
+            AsusExtension.extension._settings.set_uint("charge-level", value);
+        }
+    });

desktop-extensions/gnome-45/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "es2019"
+    ],
+    "types": [],
+    "target": "es2019",
+    "module": "ES2022",
+    "moduleResolution": "node",
+    "declaration": true,
+    "removeComments": true,
+    "strict": true,
+    "allowJs": true
+  },
+  "files": [
+    "./src/extension.ts",
+  ],
+  "include": [
+    "src/*.ts",
+    "src/**/*.ts"
+  ]
+}

desktop-extensions/gnome-45/yarn.lock

@@ -0,0 +1,940 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@esbuild/linux-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz"
+  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
+
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0":
+  version "4.5.1"
+  resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+
+"@eslint/eslintrc@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz"
+  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.44.0":
+  version "8.44.0"
+  resolved "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz"
+  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
+    debug "^4.1.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@types/json-schema@^7.0.9":
+  version "7.0.12"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
+"@types/semver@^7.3.12":
+  version "7.5.0"
+  resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+
+"@typescript-eslint/eslint-plugin@^5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz"
+  integrity sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.60.1"
+    "@typescript-eslint/type-utils" "5.60.1"
+    "@typescript-eslint/utils" "5.60.1"
+    debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.60.1.tgz"
+  integrity sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.60.1"
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/typescript-estree" "5.60.1"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz"
+  integrity sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==
+  dependencies:
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/visitor-keys" "5.60.1"
+
+"@typescript-eslint/type-utils@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz"
+  integrity sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.60.1"
+    "@typescript-eslint/utils" "5.60.1"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz"
+  integrity sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==
+
+"@typescript-eslint/typescript-estree@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz"
+  integrity sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==
+  dependencies:
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/visitor-keys" "5.60.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz"
+  integrity sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.60.1"
+    "@typescript-eslint/types" "5.60.1"
+    "@typescript-eslint/typescript-estree" "5.60.1"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
+"@typescript-eslint/visitor-keys@5.60.1":
+  version "5.60.1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz"
+  integrity sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==
+  dependencies:
+    "@typescript-eslint/types" "5.60.1"
+    eslint-visitor-keys "^3.3.0"
+
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.9.0:
+  version "8.9.0"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
+
+adm-zip@^0.5.10:
+  version "0.5.10"
+  resolved "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz"
+  integrity sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==
+
+ajv@^6.10.0, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+esbuild@^0.17.19:
+  version "0.17.19"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"
+  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+  optionalDependencies:
+    "@esbuild/android-arm" "0.17.19"
+    "@esbuild/android-arm64" "0.17.19"
+    "@esbuild/android-x64" "0.17.19"
+    "@esbuild/darwin-arm64" "0.17.19"
+    "@esbuild/darwin-x64" "0.17.19"
+    "@esbuild/freebsd-arm64" "0.17.19"
+    "@esbuild/freebsd-x64" "0.17.19"
+    "@esbuild/linux-arm" "0.17.19"
+    "@esbuild/linux-arm64" "0.17.19"
+    "@esbuild/linux-ia32" "0.17.19"
+    "@esbuild/linux-loong64" "0.17.19"
+    "@esbuild/linux-mips64el" "0.17.19"
+    "@esbuild/linux-ppc64" "0.17.19"
+    "@esbuild/linux-riscv64" "0.17.19"
+    "@esbuild/linux-s390x" "0.17.19"
+    "@esbuild/linux-x64" "0.17.19"
+    "@esbuild/netbsd-x64" "0.17.19"
+    "@esbuild/openbsd-x64" "0.17.19"
+    "@esbuild/sunos-x64" "0.17.19"
+    "@esbuild/win32-arm64" "0.17.19"
+    "@esbuild/win32-ia32" "0.17.19"
+    "@esbuild/win32-x64" "0.17.19"
+
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint@*, "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", eslint@^8.44.0:
+  version "8.44.0"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz"
+  integrity sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.1.0"
+    "@eslint/js" "8.44.0"
+    "@humanwhocodes/config-array" "^0.11.10"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.6.0"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    strip-json-comments "^3.1.0"
+    text-table "^0.2.0"
+
+espree@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz"
+  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.2.9:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz"
+  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
+fastq@^1.6.0:
+  version "1.15.0"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  dependencies:
+    reusify "^1.0.4"
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@^7.1.3:
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+ignore@^5.2.0:
+  version "5.2.4"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
+minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+punycode@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+semver@^7.3.7:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+typescript@^5.1.6, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
+  version "5.1.6"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"
+  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

distro-packaging/asusctl.spec

@@ -0,0 +1,128 @@
+#
+# spec file for package asus-nb-ctrl
+#
+# Copyright (c) 2020-2021 Luke Jones <luke@ljones.dev>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+%if %{defined fedora}
+%global debug_package %{nil}
+%endif
+
+%global rpm_dkms_opt 1
+
+# Use hardening ldflags.
+%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
+Name:           asusctl
+Version:        4.7.0
+Release:        2
+Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
+License:        MPLv2
+
+Group:          System Environment/Kernel
+
+URL:            https://gitlab.com/asus-linux/asusctl
+Source:         %{name}-%{version}.tar.gz
+Source1:        vendor-%{name}-%{version}.tar.gz
+Source2:        cargo_config
+
+BuildRequires:  cargo
+BuildRequires:  rust-packaging
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  clang-devel
+BuildRequires:  cmake
+BuildRequires:  rust
+BuildRequires:  rust-std-static
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gdk-3.0)
+BuildRequires:  desktop-file-utils
+Requires: libappindicator-gtk3
+
+%description
+asus-nb-ctrl is a utility for Linux to control many aspects of various
+ASUS laptops but can also be used with non-Asus laptops with reduced features.
+
+It provides an interface for rootless control of some system functions such as
+fan speeds, keyboard LEDs, battery charge level, and graphics modes.
+asus-nb-ctrl enables third-party apps to use the above with dbus methods.
+
+%package rog-gui
+Summary: An experimental GUI for %{name}
+
+%description rog-gui
+A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls,
+a notification service, and ability to run in the background.
+
+%prep
+%autosetup
+%setup -D -T -a 1 -c -n %{name}-%{version}/vendor
+cd ..
+
+mv Cargo.lock{,.bak}
+%cargo_prep
+mv Cargo.lock{.bak,}
+sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
+cat %{SOURCE2} >> .cargo/config
+
+%build
+export RUSTFLAGS="%{rustflags}"
+%cargo_build
+#cargo build --release --frozen --offline --config .cargo/config.toml
+
+%install
+export RUSTFLAGS="%{rustflags}"
+mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
+%make_install
+ 
+install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
+install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
+install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop
+
+%files
+%license LICENSE
+%{_bindir}/asusd
+%{_bindir}/asusd-user
+%{_bindir}/asusctl
+%{_unitdir}/asusd.service
+%{_userunitdir}/asusd-user.service
+%{_udevrulesdir}/99-asusd.rules
+#%dir %{_sysconfdir}/asusd/
+%{_datadir}/asusd/aura_support.ron
+%{_datadir}/dbus-1/system.d/asusd.conf
+%{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png
+%{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png
+%{_datadir}/icons/hicolor/512x512/apps/asus_notif_red.png
+%{_datadir}/icons/hicolor/512x512/apps/asus_notif_blue.png
+%{_datadir}/icons/hicolor/512x512/apps/asus_notif_orange.png
+%{_datadir}/icons/hicolor/512x512/apps/asus_notif_white.png
+%{_datadir}/icons/hicolor/scalable/status/gpu-compute.svg
+%{_datadir}/icons/hicolor/scalable/status/gpu-hybrid.svg
+%{_datadir}/icons/hicolor/scalable/status/gpu-integrated.svg
+%{_datadir}/icons/hicolor/scalable/status/gpu-nvidia.svg
+%{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg
+%{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg
+%{_docdir}/%{name}/
+%{_datadir}/asusd/
+
+%files rog-gui
+%{_bindir}/rog-control-center
+%{_datadir}/applications/rog-control-center.desktop
+%{_datadir}/icons/hicolor/512x512/apps/rog-control-center.png
+%{_datadir}/rog-gui
+
+%changelog

rog-aura/data/aura_support.ron

@@ -31,6 +31,14 @@
         advanced_type: None,
         power_zones: [Keyboard],
     ),
+    (
+        board_name: "FX505G",
+        layout_name: "fx505d",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
+        basic_zones: [],
+        advanced_type: None,
+        power_zones: [Keyboard],
+    ),
     (
         board_name: "FX506H",
         layout_name: "fa506i",
@@ -271,6 +279,14 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        board_name: "G713RC",
+        layout_name: "gx502",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
+        basic_zones: [],
+        advanced_type: Zoned([ZonedKbLeft, ZonedKbLeftMid, ZonedKbRightMid, ZonedKbRight, LightbarRight, LightbarRightCorner, LightbarRightBottom, LightbarLeftBottom, LightbarLeftCorner, LightbarLeft]),
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         board_name: "G713RM",
         layout_name: "ga401q",
@@ -343,6 +359,14 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        board_name: "G733PZ",
+        layout_name: "g733pz-per-key",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         board_name: "G733Q",
         layout_name: "gx502",
@@ -375,6 +399,14 @@
         advanced_type: None,
         power_zones: [Keyboard],
     ),
+    (
+        board_name: "GA402X",
+        layout_name: "ga401q",
+        basic_modes: [Static, Breathe, Pulse, Rainbow],
+        basic_zones: [],
+        advanced_type: None,
+        power_zones: [Keyboard],
+    ),
     (
         board_name: "GA503Q",
         layout_name: "ga401q",
@@ -495,6 +527,14 @@
         advanced_type: Zoned([SingleZone]),
         power_zones: [Keyboard],
     ),
+    (
+        board_name: "GU603VV",
+        layout_name: "ga401q",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
+        basic_zones: [],
+        advanced_type: Zoned([SingleZone]),
+        power_zones: [Keyboard],
+    ),
     (
         board_name: "GU603Z",
         layout_name: "ga401q",
@@ -544,11 +584,11 @@
         power_zones: [Keyboard],
     ),
     (
-        board_name: "GV601VI",
+        board_name: "GV601V",
         layout_name: "ga401q",
-        basic_modes: [Static, Breathe, Pulse, Strobe],
+        basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: Zoned([SingleZone]),
         power_zones: [Keyboard],
     ),
     (

rog-aura/data/layouts/g733pz-per-key_US.ron

@@ -0,0 +1,398 @@
+(
+    locale: "US",
+    key_shapes: {
+        "regular": Led(
+            width: 1.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "regular2": Led(
+            width: 1.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rog_row": Led(
+            width: 1.0,
+            height: 0.6,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.6,
+        ),
+        "rog_row_blocking": Blank(
+            width: 1.2,
+            height: 0.0,
+        ),
+        "func_key": Led(
+            width: 1.0,
+            height: 0.6,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.0,
+            pad_bottom: 0.1,
+        ),
+        "func_space": Blank(
+            width: 0.5,
+            height: 0.0,
+        ),
+        "esc_func_spacing": Blank(
+            width: 1.2,
+            height: 0.0,
+        ),
+        "backspace": Led(
+            width: 2.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "bkslash": Led(
+            width: 1.4,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "tab": Led(
+            width: 1.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "capsplonk": Led(
+            width: 1.9,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "return": Led(
+            width: 2.3,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lshift": Led(
+            width: 2.5,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rshift": Led(
+            width: 2.9,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lctrl": Led(
+            width: 1.4,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "spacebar": Led(
+            width: 6.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rctrl": Led(
+            width: 1.2,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "up_arrow": Led(
+            width: 1.0,
+            height: 0.6,
+            pad_left: 1.5,
+            pad_right: 1.3,
+            pad_top: 0.1,
+            pad_bottom: 0.0,
+        ),
+        "arrows_spacer": Blank(
+            width: 14.2,
+            height: 0.0,
+        ),
+        "arrows": Led(
+            width: 1.0,
+            height: 0.6,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: -0.3,
+            pad_bottom: 0.1,
+        ),
+        "numpad_tall": Led(
+            width: 1.0,
+            height: 2.2,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: -1.2,
+        ),
+        "numpad_wide": Led(
+            width: 2.2,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lightbar_left": Led(
+            width: 0.4,
+            height: 3.0,
+            pad_left: -1.0,
+            pad_right: 0.1,
+            pad_top: -2.7,
+            pad_bottom: 0.1,
+        ),
+        "lightbar_corner_left": Led(
+            width: 0.4,
+            height: 0.4,
+            pad_left: -0.5,
+            pad_right: 0.1,
+            pad_top: 0.5,
+            pad_bottom: 0.1,
+        ),
+        "lightbar_bottom": Led(
+            width: 11.85,
+            height: 0.4,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.5,
+            pad_bottom: 0.1,
+        ),
+        "lightbar_corner_right": Led(
+            width: 0.4,
+            height: 0.4,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.5,
+            pad_bottom: 0.1,
+        ),
+        "lightbar_right": Led(
+            width: 0.4,
+            height: 3.0,
+            pad_left: -0.5,
+            pad_right: 0.1,
+            pad_top: -2.7,
+            pad_bottom: 0.1,
+        ),
+    },
+    key_rows: [
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Blocking, "rog_row_blocking"),
+                (Blocking, "rog_row_blocking"),
+                (VolDown, "rog_row"),
+                (VolUp, "rog_row"),
+                (MicMute, "rog_row"),
+                (RogFan, "rog_row"),
+                (RogApp, "rog_row"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_top: 0.1,
+            row: [
+                (Esc, "func_key"),
+                (Spacing, "esc_func_spacing"),
+                (F1, "func_key"),
+                (F2, "func_key"),
+                (F3, "func_key"),
+                (F4, "func_key"),
+                (Spacing, "func_space"),
+                (F5, "func_key"),
+                (F6, "func_key"),
+                (F7, "func_key"),
+                (F8, "func_key"),
+                (Spacing, "func_space"),
+                (F9, "func_key"),
+                (F10, "func_key"),
+                (F11, "func_key"),
+                (F12, "func_key"),
+                (Spacing, "func_space"),
+                (Del, "func_key"),
+                (NumPadPause, "func_key"),
+                (NumPadPrtSc, "func_key"),
+                (NumPadHome, "func_key"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Tilde, "regular"),
+                (N1, "regular"),
+                (N2, "regular"),
+                (N3, "regular"),
+                (N4, "regular"),
+                (N5, "regular"),
+                (N6, "regular"),
+                (N7, "regular"),
+                (N8, "regular"),
+                (N9, "regular"),
+                (N0, "regular"),
+                (Hyphen, "regular"),
+                (Equals, "regular"),
+                (Backspace, "backspace"),
+                (Spacing, "func_space"),
+                (NumLock, "regular"),
+                (FwdSlash, "regular"),
+                (Star, "regular"),
+                (Hyphen, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Tab, "tab"),
+                (Q, "regular"),
+                (W, "regular"),
+                (E, "regular"),
+                (R, "regular"),
+                (T, "regular"),
+                (Y, "regular"),
+                (U, "regular"),
+                (I, "regular"),
+                (O, "regular"),
+                (P, "regular"),
+                (LBracket, "regular"),
+                (RBracket, "regular"),
+                (BackSlash, "bkslash"),
+                (Spacing, "func_space"),
+                (N7, "regular"),
+                (N8, "regular"),
+                (N9, "regular"),
+                (NumPadPlus, "numpad_tall"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Caps, "capsplonk"),
+                (A, "regular"),
+                (S, "regular"),
+                (D, "regular"),
+                (F, "regular"),
+                (G, "regular"),
+                (H, "regular"),
+                (J, "regular"),
+                (K, "regular"),
+                (L, "regular"),
+                (SemiColon, "regular"),
+                (Quote, "regular"),
+                (Return, "return"),
+                (Spacing, "func_space"),
+                (N4, "regular"),
+                (N5, "regular"),
+                (N6, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LShift, "lshift"),
+                (Z, "regular"),
+                (X, "regular"),
+                (C, "regular"),
+                (V, "regular"),
+                (B, "regular"),
+                (N, "regular"),
+                (M, "regular"),
+                (Comma, "regular"),
+                (Period, "regular"),
+                (FwdSlash, "regular"),
+                (Rshift, "rshift"),
+                (Spacing, "func_space"),
+                (N1, "regular"),
+                (N2, "regular"),
+                (N3, "regular"),
+                (NumPadEnter, "numpad_tall"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LCtrl, "lctrl"),
+                (LFn, "regular2"),
+                (Meta, "regular2"),
+                (LAlt, "regular2"),
+                (Spacebar, "spacebar"),
+                (RAlt, "regular2"),
+                (RCtrl, "rctrl"),
+                (Up, "up_arrow"),
+                (Spacing, "func_space"),
+                (N0, "numpad_wide"),
+                (NumPadDel, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Spacing, "arrows_spacer"),
+                (Left, "arrows"),
+                (Down, "arrows"),
+                (Right, "arrows"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LightbarLeft, "lightbar_left"),
+                (LightbarLeftCorner, "lightbar_corner_left"),
+                (LightbarLeftBottom, "lightbar_bottom"),
+                (LightbarRightBottom, "lightbar_bottom"),
+                (LightbarRightCorner, "lightbar_corner_right"),
+                (LightbarRight, "lightbar_right"),
+            ],
+        ),
+    ],
+)

rog-aura/src/aura_detection.rs

@@ -24,7 +24,7 @@ pub struct LedSupportFile(Vec<LaptopLedData>);
 /// The powerr zones this laptop supports
 #[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
-#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Default, Clone)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Default, Copy, Clone)]
 pub enum PowerZones {
     /// The logo on some laptop lids
     #[default]
@@ -63,7 +63,7 @@ impl LaptopLedData {
         // let prod_family = dmi.product_family().expect("Could not get
         // product_family");
 
-        if let Some(modes) = LedSupportFile::load_from_config() {
+        if let Some(modes) = LedSupportFile::load_from_supoprt_db() {
             if let Some(data) = modes.matcher(&board_name) {
                 return data;
             }
@@ -90,7 +90,12 @@ impl LedSupportFile {
         None
     }
 
-    pub fn load_from_config() -> Option<Self> {
+    /// Load `LedSupportFile` from the `aura_support.ron` file at
+    /// `/usr/share/asusd/aura_support.ron` and append with data from
+    /// `/etc/asusd/asusd_user_ledmodes.ron` if that file is available.
+    ///
+    /// Returns `None` if neither file exists or does not parse correctly.
+    pub fn load_from_supoprt_db() -> Option<Self> {
         let mut loaded = false;
         let mut data = LedSupportFile::default();
         // Load user configs first so they are first to be checked

rog-aura/src/builtin_modes.rs

@@ -17,10 +17,11 @@ use crate::LED_MSG_LEN;
 
 #[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum LedBrightness {
     Off,
     Low,
+    #[default]
     Med,
     High,
 }

rog-aura/src/deprecated.rs

@@ -0,0 +1,162 @@
+//! Older code that is not useful but stillr elevant as a reference
+
+/// # Bits for newer 0x18c6, 0x19B6, 0x1a30, keyboard models
+///
+/// | Byte 1 | Byte 2  | Byte 3  | Byte 4  | Label    |
+/// |--------|---------|---------|---------|----------|
+/// |00000001| 00000000| 00000000| 00000000|boot_logo_|
+/// |00000010| 00000000| 00000000| 00000000|boot_keyb_|
+/// |00000100| 00000000| 00000000| 00000000|awake_logo|
+/// |00001000| 00000000| 00000000| 00000000|awake_keyb|
+/// |00010000| 00000000| 00000000| 00000000|sleep_logo|
+/// |00100000| 00000000| 00000000| 00000000|sleep_keyb|
+/// |01000000| 00000000| 00000000| 00000000|shut_logo_|
+/// |10000000| 00000000| 00000000| 00000000|shut_keyb_|
+/// |00000000| 00000010| 00000000| 00000000|boot_bar__|
+/// |00000000| 00000100| 00000000| 00000000|awake_bar_|
+/// |00000000| 00001000| 00000000| 00000000|sleep_bar_|
+/// |00000000| 00010000| 00000000| 00000000|shut_bar__|
+/// |00000000| 00000000| 00000001| 00000000|boot_lid__|
+/// |00000000| 00000000| 00000010| 00000000|awkae_lid_|
+/// |00000000| 00000000| 00000100| 00000000|sleep_lid_|
+/// |00000000| 00000000| 00001000| 00000000|shut_lid__|
+/// |00000000| 00000000| 00000000| 00000001|boot_rear_|
+/// |00000000| 00000000| 00000000| 00000010|awake_rear|
+/// |00000000| 00000000| 00000000| 00000100|sleep_rear|
+/// |00000000| 00000000| 00000000| 00001000|shut_rear_|
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[repr(u32)]
+pub enum AuraDevRog2 {
+    BootLogo = 1,
+    BootKeyb = 1 << 1,
+    AwakeLogo = 1 << 2,
+    AwakeKeyb = 1 << 3,
+    SleepLogo = 1 << 4,
+    SleepKeyb = 1 << 5,
+    ShutdownLogo = 1 << 6,
+    ShutdownKeyb = 1 << 7,
+    BootBar = 1 << (7 + 2),
+    AwakeBar = 1 << (7 + 3),
+    SleepBar = 1 << (7 + 4),
+    ShutdownBar = 1 << (7 + 5),
+    BootLid = 1 << (15 + 1),
+    AwakeLid = 1 << (15 + 2),
+    SleepLid = 1 << (15 + 3),
+    ShutdownLid = 1 << (15 + 4),
+    BootRearGlow = 1 << (23 + 1),
+    AwakeRearGlow = 1 << (23 + 2),
+    SleepRearGlow = 1 << (23 + 3),
+    ShutdownRearGlow = 1 << (23 + 4),
+}
+
+impl From<AuraDevRog2> for u32 {
+    fn from(a: AuraDevRog2) -> Self {
+        a as u32
+    }
+}
+
+impl AuraDevRog2 {
+    pub fn to_bytes(control: &[Self]) -> [u8; 4] {
+        let mut a: u32 = 0;
+        for n in control {
+            a |= *n as u32;
+        }
+        [
+            (a & 0xff) as u8,
+            ((a & 0xff00) >> 8) as u8,
+            ((a & 0xff0000) >> 16) as u8,
+            ((a & 0xff000000) >> 24) as u8,
+        ]
+    }
+
+    pub const fn dev_id() -> &'static str {
+        "0x196b"
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::deprecated::AuraDevRog2;
+
+    #[test]
+    fn check_0x19b6_control_bytes_binary_rep() {
+        fn to_binary_string(bytes: &[AuraDevRog2]) -> String {
+            let bytes = AuraDevRog2::to_bytes(bytes);
+            format!(
+                "{:08b}, {:08b}, {:08b}, {:08b}",
+                bytes[0], bytes[1], bytes[2], bytes[3]
+            )
+        }
+
+        let boot_logo_ = to_binary_string(&[AuraDevRog2::BootLogo]);
+        let boot_keyb_ = to_binary_string(&[AuraDevRog2::BootKeyb]);
+        let sleep_logo = to_binary_string(&[AuraDevRog2::SleepLogo]);
+        let sleep_keyb = to_binary_string(&[AuraDevRog2::SleepKeyb]);
+        let awake_logo = to_binary_string(&[AuraDevRog2::AwakeLogo]);
+        let awake_keyb = to_binary_string(&[AuraDevRog2::AwakeKeyb]);
+        let shut_logo_ = to_binary_string(&[AuraDevRog2::ShutdownLogo]);
+        let shut_keyb_ = to_binary_string(&[AuraDevRog2::ShutdownKeyb]);
+        let boot_bar__ = to_binary_string(&[AuraDevRog2::BootBar]);
+        let awake_bar_ = to_binary_string(&[AuraDevRog2::AwakeBar]);
+        let sleep_bar_ = to_binary_string(&[AuraDevRog2::SleepBar]);
+        let shut_bar__ = to_binary_string(&[AuraDevRog2::ShutdownBar]);
+        let boot_lid__ = to_binary_string(&[AuraDevRog2::BootLid]);
+        let awkae_lid_ = to_binary_string(&[AuraDevRog2::AwakeLid]);
+        let sleep_lid_ = to_binary_string(&[AuraDevRog2::SleepLid]);
+        let shut_lid__ = to_binary_string(&[AuraDevRog2::ShutdownLid]);
+        let boot_rear_ = to_binary_string(&[AuraDevRog2::BootRearGlow]);
+        let awake_rear = to_binary_string(&[AuraDevRog2::AwakeRearGlow]);
+        let sleep_rear = to_binary_string(&[AuraDevRog2::SleepRearGlow]);
+        let shut_rear_ = to_binary_string(&[AuraDevRog2::ShutdownRearGlow]);
+
+        assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000");
+        assert_eq!(boot_keyb_, "00000010, 00000000, 00000000, 00000000");
+        assert_eq!(awake_logo, "00000100, 00000000, 00000000, 00000000");
+        assert_eq!(awake_keyb, "00001000, 00000000, 00000000, 00000000");
+        assert_eq!(sleep_logo, "00010000, 00000000, 00000000, 00000000");
+        assert_eq!(sleep_keyb, "00100000, 00000000, 00000000, 00000000");
+        assert_eq!(shut_logo_, "01000000, 00000000, 00000000, 00000000");
+        assert_eq!(shut_keyb_, "10000000, 00000000, 00000000, 00000000");
+        //
+        assert_eq!(boot_bar__, "00000000, 00000010, 00000000, 00000000");
+        assert_eq!(awake_bar_, "00000000, 00000100, 00000000, 00000000");
+        assert_eq!(sleep_bar_, "00000000, 00001000, 00000000, 00000000");
+        assert_eq!(shut_bar__, "00000000, 00010000, 00000000, 00000000");
+        //
+        assert_eq!(boot_lid__, "00000000, 00000000, 00000001, 00000000");
+        assert_eq!(awkae_lid_, "00000000, 00000000, 00000010, 00000000");
+        assert_eq!(sleep_lid_, "00000000, 00000000, 00000100, 00000000");
+        assert_eq!(shut_lid__, "00000000, 00000000, 00001000, 00000000");
+        //
+        assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00000001");
+        assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00000010");
+        assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 00000100");
+        assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 00001000");
+
+        // All on
+        let byte1 = [
+            AuraDevRog2::BootLogo,
+            AuraDevRog2::BootKeyb,
+            AuraDevRog2::SleepLogo,
+            AuraDevRog2::SleepKeyb,
+            AuraDevRog2::AwakeLogo,
+            AuraDevRog2::AwakeKeyb,
+            AuraDevRog2::ShutdownLogo,
+            AuraDevRog2::ShutdownKeyb,
+            AuraDevRog2::BootBar,
+            AuraDevRog2::AwakeBar,
+            AuraDevRog2::SleepBar,
+            AuraDevRog2::ShutdownBar,
+            AuraDevRog2::AwakeLid,
+            AuraDevRog2::BootLid,
+            AuraDevRog2::SleepLid,
+            AuraDevRog2::ShutdownLid,
+            AuraDevRog2::AwakeRearGlow,
+            AuraDevRog2::BootRearGlow,
+            AuraDevRog2::SleepRearGlow,
+            AuraDevRog2::ShutdownRearGlow,
+        ];
+        let out = to_binary_string(&byte1);
+        assert_eq!(out, "11111111, 00011110, 00001111, 00001111");
+    }
+}

rog-aura/src/layouts.rs

@@ -522,7 +522,6 @@ mod tests {
         let mut data_path = PathBuf::from(DATA_DIR);
         data_path.push("data");
         data_path.push("aura_support.ron");
-        dbg!(&data_path);
 
         let mut buf = std::fs::read_to_string(&data_path).unwrap();
         let data: LedSupportFile = ron::from_str(&buf).unwrap();

rog-aura/src/lib.rs

@@ -18,6 +18,10 @@ pub mod aura_detection;
 pub mod layouts;
 pub mod usb;
 
+pub mod power;
+
+mod deprecated;
+
 pub const LED_MSG_LEN: usize = 17;
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 

rog-aura/src/power.rs

@@ -0,0 +1,344 @@
+use std::fmt::Debug;
+
+use serde::{Deserialize, Serialize};
+use typeshare::typeshare;
+#[cfg(feature = "dbus")]
+use zbus::zvariant::Type;
+
+use crate::aura_detection::PowerZones;
+
+#[typeshare]
+#[cfg_attr(feature = "dbus", derive(Type))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct KbAuraPowerState {
+    pub zone: PowerZones,
+    pub boot: bool,
+    pub awake: bool,
+    pub sleep: bool,
+    pub shutdown: bool,
+}
+
+impl Default for KbAuraPowerState {
+    /// Defaults all to off
+    fn default() -> Self {
+        Self {
+            zone: PowerZones::Keyboard,
+            boot: false,
+            awake: false,
+            sleep: false,
+            shutdown: false,
+        }
+    }
+}
+
+impl KbAuraPowerState {
+    pub fn to_byte(&self, zone: PowerZones) -> u32 {
+        match zone {
+            PowerZones::Logo => {
+                self.boot as u32
+                    | (self.awake as u32) << 2
+                    | (self.sleep as u32) << 4
+                    | (self.shutdown as u32) << 6
+            }
+            PowerZones::Keyboard => {
+                (self.boot as u32) << 1
+                    | (self.awake as u32) << 3
+                    | (self.sleep as u32) << 5
+                    | (self.shutdown as u32) << 7
+            }
+            PowerZones::Lightbar => {
+                (self.boot as u32) << (7 + 2)
+                    | (self.awake as u32) << (7 + 3)
+                    | (self.sleep as u32) << (7 + 4)
+                    | (self.shutdown as u32) << (7 + 5)
+            }
+            PowerZones::Lid => {
+                (self.boot as u32) << (15 + 1)
+                    | (self.awake as u32) << (15 + 2)
+                    | (self.sleep as u32) << (15 + 3)
+                    | (self.shutdown as u32) << (15 + 4)
+            }
+            PowerZones::RearGlow => {
+                (self.boot as u32) << (23 + 1)
+                    | (self.awake as u32) << (23 + 2)
+                    | (self.sleep as u32) << (23 + 3)
+                    | (self.shutdown as u32) << (23 + 4)
+            }
+        }
+    }
+}
+
+/// Track and control the Aura keyboard power state
+///
+/// # Bits for newer 0x18c6, 0x19B6, 0x1a30, keyboard models
+///
+/// | Byte 1 | Byte 2  | Byte 3  | Byte 4  | Label    |
+/// |--------|---------|---------|---------|----------|
+/// |00000001| 00000000| 00000000| 00000000|boot_logo_|
+/// |00000010| 00000000| 00000000| 00000000|boot_keyb_|
+/// |00000100| 00000000| 00000000| 00000000|awake_logo|
+/// |00001000| 00000000| 00000000| 00000000|awake_keyb|
+/// |00010000| 00000000| 00000000| 00000000|sleep_logo|
+/// |00100000| 00000000| 00000000| 00000000|sleep_keyb|
+/// |01000000| 00000000| 00000000| 00000000|shut_logo_|
+/// |10000000| 00000000| 00000000| 00000000|shut_keyb_|
+/// |00000000| 00000010| 00000000| 00000000|boot_bar__|
+/// |00000000| 00000100| 00000000| 00000000|awake_bar_|
+/// |00000000| 00001000| 00000000| 00000000|sleep_bar_|
+/// |00000000| 00010000| 00000000| 00000000|shut_bar__|
+/// |00000000| 00000000| 00000001| 00000000|boot_lid__|
+/// |00000000| 00000000| 00000010| 00000000|awkae_lid_|
+/// |00000000| 00000000| 00000100| 00000000|sleep_lid_|
+/// |00000000| 00000000| 00001000| 00000000|shut_lid__|
+/// |00000000| 00000000| 00000000| 00000001|boot_rear_|
+/// |00000000| 00000000| 00000000| 00000010|awake_rear|
+/// |00000000| 00000000| 00000000| 00000100|sleep_rear|
+/// |00000000| 00000000| 00000000| 00001000|shut_rear_|
+#[typeshare]
+#[cfg_attr(feature = "dbus", derive(Type))]
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AuraPower {
+    pub keyboard: KbAuraPowerState,
+    pub logo: KbAuraPowerState,
+    pub lightbar: KbAuraPowerState,
+    pub lid: KbAuraPowerState,
+    pub rear_glow: KbAuraPowerState,
+}
+
+impl AuraPower {
+    pub fn new_all_on() -> Self {
+        Self {
+            keyboard: KbAuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true,
+            },
+            logo: KbAuraPowerState {
+                zone: PowerZones::Logo,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true,
+            },
+            lightbar: KbAuraPowerState {
+                zone: PowerZones::Lightbar,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true,
+            },
+            lid: KbAuraPowerState {
+                zone: PowerZones::Lid,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true,
+            },
+            rear_glow: KbAuraPowerState {
+                zone: PowerZones::RearGlow,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true,
+            },
+        }
+    }
+
+    pub fn to_bytes(&self) -> [u8; 4] {
+        let mut a: u32 = 0;
+        a |= self.keyboard.to_byte(PowerZones::Keyboard);
+        a |= self.logo.to_byte(PowerZones::Logo);
+        a |= self.lid.to_byte(PowerZones::Lid);
+        a |= self.lightbar.to_byte(PowerZones::Lightbar);
+        a |= self.rear_glow.to_byte(PowerZones::RearGlow);
+        [
+            (a & 0xff) as u8,
+            ((a & 0xff00) >> 8) as u8,
+            ((a & 0xff0000) >> 16) as u8,
+            ((a & 0xff000000) >> 24) as u8,
+        ]
+    }
+}
+
+#[test]
+fn check_0x19b6_control_bytes_binary_rep() {
+    fn to_binary_string(power: &AuraPower) -> String {
+        let bytes = power.to_bytes();
+        format!(
+            "{:08b}, {:08b}, {:08b}, {:08b}",
+            bytes[0], bytes[1], bytes[2], bytes[3]
+        )
+    }
+
+    let boot_logo_ = to_binary_string(&AuraPower {
+        logo: KbAuraPowerState {
+            boot: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let boot_keyb_ = to_binary_string(&AuraPower {
+        keyboard: KbAuraPowerState {
+            boot: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let sleep_logo = to_binary_string(&AuraPower {
+        logo: KbAuraPowerState {
+            sleep: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let sleep_keyb = to_binary_string(&AuraPower {
+        keyboard: KbAuraPowerState {
+            sleep: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let awake_logo = to_binary_string(&AuraPower {
+        logo: KbAuraPowerState {
+            awake: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let awake_keyb = to_binary_string(&AuraPower {
+        keyboard: KbAuraPowerState {
+            awake: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let shut_logo_ = to_binary_string(&AuraPower {
+        logo: KbAuraPowerState {
+            shutdown: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let shut_keyb_ = to_binary_string(&AuraPower {
+        keyboard: KbAuraPowerState {
+            shutdown: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let boot_bar__ = to_binary_string(&AuraPower {
+        lightbar: KbAuraPowerState {
+            boot: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let awake_bar_ = to_binary_string(&AuraPower {
+        lightbar: KbAuraPowerState {
+            awake: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let sleep_bar_ = to_binary_string(&AuraPower {
+        lightbar: KbAuraPowerState {
+            sleep: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let shut_bar__ = to_binary_string(&AuraPower {
+        lightbar: KbAuraPowerState {
+            shutdown: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let boot_lid__ = to_binary_string(&AuraPower {
+        lid: KbAuraPowerState {
+            boot: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let awkae_lid_ = to_binary_string(&AuraPower {
+        lid: KbAuraPowerState {
+            awake: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let sleep_lid_ = to_binary_string(&AuraPower {
+        lid: KbAuraPowerState {
+            sleep: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let shut_lid__ = to_binary_string(&AuraPower {
+        lid: KbAuraPowerState {
+            shutdown: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let boot_rear_ = to_binary_string(&AuraPower {
+        rear_glow: KbAuraPowerState {
+            boot: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let awake_rear = to_binary_string(&AuraPower {
+        rear_glow: KbAuraPowerState {
+            awake: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let sleep_rear = to_binary_string(&AuraPower {
+        rear_glow: KbAuraPowerState {
+            sleep: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+    let shut_rear_ = to_binary_string(&AuraPower {
+        rear_glow: KbAuraPowerState {
+            shutdown: true,
+            ..Default::default()
+        },
+        ..Default::default()
+    });
+
+    assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000");
+    assert_eq!(boot_keyb_, "00000010, 00000000, 00000000, 00000000");
+    assert_eq!(awake_logo, "00000100, 00000000, 00000000, 00000000");
+    assert_eq!(awake_keyb, "00001000, 00000000, 00000000, 00000000");
+    assert_eq!(sleep_logo, "00010000, 00000000, 00000000, 00000000");
+    assert_eq!(sleep_keyb, "00100000, 00000000, 00000000, 00000000");
+    assert_eq!(shut_logo_, "01000000, 00000000, 00000000, 00000000");
+    assert_eq!(shut_keyb_, "10000000, 00000000, 00000000, 00000000");
+    //
+    assert_eq!(boot_bar__, "00000000, 00000010, 00000000, 00000000");
+    assert_eq!(awake_bar_, "00000000, 00000100, 00000000, 00000000");
+    assert_eq!(sleep_bar_, "00000000, 00001000, 00000000, 00000000");
+    assert_eq!(shut_bar__, "00000000, 00010000, 00000000, 00000000");
+    //
+    assert_eq!(boot_lid__, "00000000, 00000000, 00000001, 00000000");
+    assert_eq!(awkae_lid_, "00000000, 00000000, 00000010, 00000000");
+    assert_eq!(sleep_lid_, "00000000, 00000000, 00000100, 00000000");
+    assert_eq!(shut_lid__, "00000000, 00000000, 00001000, 00000000");
+    //
+    assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00000001");
+    assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00000010");
+    assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 00000100");
+    assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 00001000");
+
+    // All on
+    let byte1 = AuraPower::new_all_on();
+    let out = to_binary_string(&byte1);
+    assert_eq!(out, "11111111, 00011110, 00001111, 00001111");
+}

rog-aura/src/usb.rs

@@ -6,6 +6,8 @@ use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::Type;
 
+use crate::power::AuraPower;
+
 pub const LED_INIT1: [u8; 2] = [0x5d, 0xb9];
 pub const LED_INIT2: &str = "]ASUS Tech.Inc."; // ] == 0x5d
 pub const LED_INIT3: [u8; 6] = [0x5d, 0x05, 0x20, 0x31, 0, 0x08];
@@ -88,9 +90,14 @@ impl Debug for AuraDevice {
 #[cfg_attr(feature = "dbus", derive(Type))]
 #[derive(Clone, Default, Debug, Serialize, Deserialize)]
 pub struct AuraPowerDev {
+    /// TUF laptops use a similar style of control to the older ROG devices but
+    /// through WMI
     pub tuf: Vec<AuraDevTuf>,
-    pub x1866: Vec<AuraDevRog1>,
-    pub x19b6: Vec<AuraDevRog2>,
+    /// Pre-0x19b6 devices use a different smaller scheme to the newer ROG
+    /// devices
+    pub old_rog: Vec<AuraDevRog1>,
+    /// ASUS standardised control scheme from 2020 onwards
+    pub rog: AuraPower,
 }
 
 #[typeshare]
@@ -177,102 +184,9 @@ impl BitAnd<AuraDevRog1> for AuraDevRog1 {
     }
 }
 
-/// # Bits for newer 0x18c6, 0x19B6, 0x1a30, keyboard models
-///
-/// | Byte 1 | Byte 2  | Byte 3  | Byte 4  | Label    |
-/// |--------|---------|---------|---------|----------|
-/// |00000001| 00000000| 00000000| 00000000|boot_logo_|
-/// |00000010| 00000000| 00000000| 00000000|boot_keyb_|
-/// |00000100| 00000000| 00000000| 00000000|awake_logo|
-/// |00001000| 00000000| 00000000| 00000000|awake_keyb|
-/// |00010000| 00000000| 00000000| 00000000|sleep_logo|
-/// |00100000| 00000000| 00000000| 00000000|sleep_keyb|
-/// |01000000| 00000000| 00000000| 00000000|shut_logo_|
-/// |10000000| 00000000| 00000000| 00000000|shut_keyb_|
-/// |00000000| 00000010| 00000000| 00000000|boot_bar__|
-/// |00000000| 00000100| 00000000| 00000000|awake_bar_|
-/// |00000000| 00001000| 00000000| 00000000|sleep_bar_|
-/// |00000000| 00010000| 00000000| 00000000|shut_bar__|
-/// |00000000| 00000000| 00000001| 00000000|boot_lid__|
-/// |00000000| 00000000| 00000010| 00000000|awkae_lid_|
-/// |00000000| 00000000| 00000100| 00000000|sleep_lid_|
-/// |00000000| 00000000| 00001000| 00000000|shut_lid__|
-/// |00000000| 00000000| 00000000| 00000001|boot_rear_|
-/// |00000000| 00000000| 00000000| 00000010|awake_rear|
-/// |00000000| 00000000| 00000000| 00000100|sleep_rear|
-/// |00000000| 00000000| 00000000| 00001000|shut_rear_|
-#[typeshare]
-#[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[repr(u32)]
-pub enum AuraDevRog2 {
-    BootLogo = 1,
-    BootKeyb = 1 << 1,
-    AwakeLogo = 1 << 2,
-    AwakeKeyb = 1 << 3,
-    SleepLogo = 1 << 4,
-    SleepKeyb = 1 << 5,
-    ShutdownLogo = 1 << 6,
-    ShutdownKeyb = 1 << 7,
-    BootBar = 1 << (7 + 2),
-    AwakeBar = 1 << (7 + 3),
-    SleepBar = 1 << (7 + 4),
-    ShutdownBar = 1 << (7 + 5),
-    BootLid = 1 << (15 + 1),
-    AwakeLid = 1 << (15 + 2),
-    SleepLid = 1 << (15 + 3),
-    ShutdownLid = 1 << (15 + 4),
-    BootRearGlow = 1 << (23 + 1),
-    AwakeRearGlow = 1 << (23 + 2),
-    SleepRearGlow = 1 << (23 + 3),
-    ShutdownRearGlow = 1 << (23 + 4),
-}
-
-impl From<AuraDevRog2> for u32 {
-    fn from(a: AuraDevRog2) -> Self {
-        a as u32
-    }
-}
-
-impl AuraDevRog2 {
-    pub fn to_bytes(control: &[Self]) -> [u8; 4] {
-        let mut a: u32 = 0;
-        for n in control {
-            a |= *n as u32;
-        }
-        [
-            (a & 0xff) as u8,
-            ((a & 0xff00) >> 8) as u8,
-            ((a & 0xff0000) >> 16) as u8,
-            ((a & 0xff000000) >> 24) as u8,
-        ]
-    }
-
-    pub const fn dev_id() -> &'static str {
-        "0x196b"
-    }
-}
-
-impl BitOr<AuraDevRog2> for AuraDevRog2 {
-    type Output = u16;
-
-    fn bitor(self, rhs: AuraDevRog2) -> Self::Output {
-        self as u16 | rhs as u16
-    }
-}
-
-impl BitAnd<AuraDevRog2> for AuraDevRog2 {
-    type Output = u16;
-
-    fn bitand(self, rhs: AuraDevRog2) -> Self::Output {
-        self as u16 & rhs as u16
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::AuraDevRog1;
-    use crate::usb::AuraDevRog2;
 
     #[test]
     fn check_0x1866_control_bytes() {
@@ -308,86 +222,4 @@ mod tests {
         println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
         assert_eq!(bytes, [0xff, 0x1f, 0x000f, 0x00]);
     }
-
-    #[test]
-    fn check_0x19b6_control_bytes_binary_rep() {
-        fn to_binary_string(bytes: &[AuraDevRog2]) -> String {
-            let bytes = AuraDevRog2::to_bytes(bytes);
-            format!(
-                "{:08b}, {:08b}, {:08b}, {:08b}",
-                bytes[0], bytes[1], bytes[2], bytes[3]
-            )
-        }
-
-        let boot_logo_ = to_binary_string(&[AuraDevRog2::BootLogo]);
-        let boot_keyb_ = to_binary_string(&[AuraDevRog2::BootKeyb]);
-        let sleep_logo = to_binary_string(&[AuraDevRog2::SleepLogo]);
-        let sleep_keyb = to_binary_string(&[AuraDevRog2::SleepKeyb]);
-        let awake_logo = to_binary_string(&[AuraDevRog2::AwakeLogo]);
-        let awake_keyb = to_binary_string(&[AuraDevRog2::AwakeKeyb]);
-        let shut_logo_ = to_binary_string(&[AuraDevRog2::ShutdownLogo]);
-        let shut_keyb_ = to_binary_string(&[AuraDevRog2::ShutdownKeyb]);
-        let boot_bar__ = to_binary_string(&[AuraDevRog2::BootBar]);
-        let awake_bar_ = to_binary_string(&[AuraDevRog2::AwakeBar]);
-        let sleep_bar_ = to_binary_string(&[AuraDevRog2::SleepBar]);
-        let shut_bar__ = to_binary_string(&[AuraDevRog2::ShutdownBar]);
-        let boot_lid__ = to_binary_string(&[AuraDevRog2::BootLid]);
-        let awkae_lid_ = to_binary_string(&[AuraDevRog2::AwakeLid]);
-        let sleep_lid_ = to_binary_string(&[AuraDevRog2::SleepLid]);
-        let shut_lid__ = to_binary_string(&[AuraDevRog2::ShutdownLid]);
-        let boot_rear_ = to_binary_string(&[AuraDevRog2::BootRearGlow]);
-        let awake_rear = to_binary_string(&[AuraDevRog2::AwakeRearGlow]);
-        let sleep_rear = to_binary_string(&[AuraDevRog2::SleepRearGlow]);
-        let shut_rear_ = to_binary_string(&[AuraDevRog2::ShutdownRearGlow]);
-
-        assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000");
-        assert_eq!(boot_keyb_, "00000010, 00000000, 00000000, 00000000");
-        assert_eq!(awake_logo, "00000100, 00000000, 00000000, 00000000");
-        assert_eq!(awake_keyb, "00001000, 00000000, 00000000, 00000000");
-        assert_eq!(sleep_logo, "00010000, 00000000, 00000000, 00000000");
-        assert_eq!(sleep_keyb, "00100000, 00000000, 00000000, 00000000");
-        assert_eq!(shut_logo_, "01000000, 00000000, 00000000, 00000000");
-        assert_eq!(shut_keyb_, "10000000, 00000000, 00000000, 00000000");
-        //
-        assert_eq!(boot_bar__, "00000000, 00000010, 00000000, 00000000");
-        assert_eq!(awake_bar_, "00000000, 00000100, 00000000, 00000000");
-        assert_eq!(sleep_bar_, "00000000, 00001000, 00000000, 00000000");
-        assert_eq!(shut_bar__, "00000000, 00010000, 00000000, 00000000");
-        //
-        assert_eq!(boot_lid__, "00000000, 00000000, 00000001, 00000000");
-        assert_eq!(awkae_lid_, "00000000, 00000000, 00000010, 00000000");
-        assert_eq!(sleep_lid_, "00000000, 00000000, 00000100, 00000000");
-        assert_eq!(shut_lid__, "00000000, 00000000, 00001000, 00000000");
-        //
-        assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00000001");
-        assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00000010");
-        assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 00000100");
-        assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 00001000");
-
-        // All on
-        let byte1 = [
-            AuraDevRog2::BootLogo,
-            AuraDevRog2::BootKeyb,
-            AuraDevRog2::SleepLogo,
-            AuraDevRog2::SleepKeyb,
-            AuraDevRog2::AwakeLogo,
-            AuraDevRog2::AwakeKeyb,
-            AuraDevRog2::ShutdownLogo,
-            AuraDevRog2::ShutdownKeyb,
-            AuraDevRog2::BootBar,
-            AuraDevRog2::AwakeBar,
-            AuraDevRog2::SleepBar,
-            AuraDevRog2::ShutdownBar,
-            AuraDevRog2::AwakeLid,
-            AuraDevRog2::BootLid,
-            AuraDevRog2::SleepLid,
-            AuraDevRog2::ShutdownLid,
-            AuraDevRog2::AwakeRearGlow,
-            AuraDevRog2::BootRearGlow,
-            AuraDevRog2::SleepRearGlow,
-            AuraDevRog2::ShutdownRearGlow,
-        ];
-        let out = to_binary_string(&byte1);
-        assert_eq!(out, "11111111, 00011110, 00001111, 00001111");
-    }
 }

rog-control-center/src/main.rs

@@ -127,7 +127,7 @@ fn main() -> Result<()> {
         layouts = KeyLayout::layout_files(path.clone()).unwrap();
 
         if let Some(name) = &cli_parsed.board_name {
-            if let Some(modes) = LedSupportFile::load_from_config() {
+            if let Some(modes) = LedSupportFile::load_from_supoprt_db() {
                 if let Some(data) = modes.matcher(name) {
                     led_support = data;
                 }

rog-control-center/src/pages/fan_curve_page.rs

@@ -1,6 +1,5 @@
-use egui::Ui;
+use egui::{RichText, Ui};
 use rog_platform::supported::SupportedFunctions;
-use rog_profiles::Profile;
 
 use crate::system_state::{FanCurvesState, ProfilesState, SystemState};
 use crate::widgets::fan_graphs;
@@ -12,10 +11,6 @@ impl RogApp {
 
         egui::CentralPanel::default().show(ctx, |ui| {
             ui.heading("Custom fan curves");
-            ui.label(
-                "A fan curve is only active when the related profile is active and the curve is \
-                 enabled",
-            );
             Self::fan_curve(
                 supported,
                 &mut states.profiles,
@@ -44,35 +39,68 @@ impl RogApp {
         ui: &mut Ui,
     ) {
         ui.separator();
-        ui.label("Enabled fan-curves");
 
         let mut changed = false;
         ui.horizontal(|ui| {
-            let mut item = |p: Profile, curves: &mut FanCurvesState, mut checked: bool| {
-                if ui
-                    .add(egui::Checkbox::new(&mut checked, format!("{:?}", p)))
-                    .changed()
-                {
-                    dbus.proxies()
-                        .profile()
-                        .set_fan_curve_enabled(p, checked)
-                        .map_err(|err| {
-                            *do_error = Some(err.to_string());
-                        })
-                        .ok();
+            ui.label("Current profile: ");
+            ui.label(RichText::new(format!("{}", profiles.current)).strong());
+        });
 
-                    if !checked {
-                        curves.enabled.remove(&p);
-                    } else {
-                        curves.enabled.insert(p);
+        // ui.horizontal(|ui| {
+        //     ui.label("Enabled fan-curves: ");
+        //     let mut fan_curve_enable = |profile: Profile, fan: FanCurvePU, mut
+        // checked: bool| {         if ui
+        //             .add(egui::Checkbox::new(&mut checked, format!("{:?}", fan)))
+        //             .changed()
+        //         {
+        //             dbus.proxies()
+        //                 .profile()
+        //                 .set_fan_curves_enabled(profile, checked)
+        //                 .map_err(|err| {
+        //                     *do_error = Some(err.to_string());
+        //                 })
+        //                 .ok();
+        //             changed = true;
+        //         }
+        //     };
+
+        //     if let Some(curves) = curves.curves.get_mut(&profiles.current) {
+        //         for curve in curves.iter_mut() {
+        //             fan_curve_enable(profiles.current, curve.fan, curve.enabled);
+        //         }
+        //     }
+        // });
+
+        ui.horizontal(|ui| {
+            ui.label("Enabled fan-curves: ");
+            let mut checked = false;
+            let mut label = String::default();
+            if let Some(curves) = curves.curves.get_mut(&profiles.current) {
+                for curve in curves.iter() {
+                    label.push_str(&<&str>::from(curve.fan).to_ascii_uppercase());
+                    label.push(' ');
+                    if curve.enabled {
+                        // TODO: it's possible to set just one fan to active
+                        checked = true;
                     }
-                    changed = true;
                 }
-            };
+            }
 
-            profiles.list.sort();
-            for f in &profiles.list {
-                item(*f, curves, curves.enabled.contains(f));
+            if ui
+                .add(egui::Checkbox::new(
+                    &mut checked,
+                    RichText::new(label).strong(),
+                ))
+                .changed()
+            {
+                dbus.proxies()
+                    .profile()
+                    .set_fan_curves_enabled(profiles.current, checked)
+                    .map_err(|err| {
+                        *do_error = Some(err.to_string());
+                    })
+                    .ok();
+                changed = true;
             }
         });
 

rog-control-center/src/system_state.rs

@@ -12,7 +12,7 @@ use rog_aura::usb::AuraPowerDev;
 use rog_aura::{AuraEffect, AuraModeNum};
 use rog_platform::platform::GpuMode;
 use rog_platform::supported::SupportedFunctions;
-use rog_profiles::fan_curve_set::FanCurveSet;
+use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::{FanCurvePU, Profile};
 use supergfxctl::pci_device::{GfxMode, GfxPower};
 #[cfg(not(feature = "mocking"))]
@@ -96,8 +96,8 @@ impl ProfilesState {
 pub struct FanCurvesState {
     pub show_curve: Profile,
     pub show_graph: FanCurvePU,
-    pub enabled: HashSet<Profile>,
-    pub curves: BTreeMap<Profile, FanCurveSet>,
+    pub curves: BTreeMap<Profile, Vec<CurveData>>,
+    pub available_fans: HashSet<FanCurvePU>,
     pub drag_delta: Vec2,
 }
 
@@ -108,34 +108,24 @@ impl FanCurvesState {
         } else {
             vec![Profile::Balanced, Profile::Quiet, Profile::Performance]
         };
-        let enabled = if supported.platform_profile.fan_curves {
-            dbus.proxies()
-                .profile()
-                .enabled_fan_profiles()?
-                .iter()
-                .cloned()
-                .collect::<HashSet<_>>()
-        } else {
-            HashSet::from([Profile::Balanced, Profile::Quiet, Profile::Performance])
-        };
 
-        let mut curves: BTreeMap<Profile, FanCurveSet> = BTreeMap::new();
+        let mut curves: BTreeMap<Profile, Vec<CurveData>> = BTreeMap::new();
         for p in &profiles {
-            if supported.platform_profile.fan_curves {
+            if !supported.platform_profile.fans.is_empty() {
                 if let Ok(curve) = dbus.proxies().profile().fan_curve_data(*p) {
                     curves.insert(*p, curve);
                 }
             } else {
-                let mut curve = FanCurveSet::default();
-                curve.cpu.pwm = [30, 40, 60, 100, 140, 180, 200, 250];
-                curve.cpu.temp = [20, 30, 40, 50, 70, 80, 90, 100];
-                curve.gpu.pwm = [40, 80, 100, 140, 170, 200, 230, 250];
-                curve.gpu.temp = [20, 30, 40, 50, 70, 80, 90, 100];
-                curves.insert(*p, curve);
+                curves.insert(*p, Vec::default());
             }
         }
 
-        let show_curve = if supported.platform_profile.fan_curves {
+        let mut available_fans = HashSet::new();
+        for fan in supported.platform_profile.fans.iter() {
+            available_fans.insert(*fan);
+        }
+
+        let show_curve = if !supported.platform_profile.fans.is_empty() {
             dbus.proxies().profile().active_profile()?
         } else {
             Profile::Balanced
@@ -144,8 +134,8 @@ impl FanCurvesState {
         Ok(Self {
             show_curve,
             show_graph: FanCurvePU::CPU,
-            enabled,
             curves,
+            available_fans,
             drag_delta: Vec2::default(),
         })
     }
@@ -177,7 +167,7 @@ impl AuraState {
             } else {
                 BTreeMap::new()
             },
-            enabled: dbus.proxies().led().led_powered().unwrap_or_default(),
+            enabled: dbus.proxies().led().led_power().unwrap_or_default(),
             bright: dbus.proxies().led().led_brightness().unwrap_or_default(),
             wave_red: [0u8; 22],
             wave_green: [0u8; 22],
@@ -427,11 +417,7 @@ impl Default for SystemState {
             aura: AuraState {
                 current_mode: AuraModeNum::Static,
                 modes: Default::default(),
-                enabled: AuraPowerDev {
-                    tuf: vec![],
-                    x1866: vec![],
-                    x19b6: vec![],
-                },
+                enabled: AuraPowerDev::default(),
                 ..Default::default()
             },
             anime: AnimeState::default(),

rog-control-center/src/update_and_notify.rs

@@ -274,19 +274,48 @@ pub fn start_notifications(
         let conn = zbus::Connection::system()
             .await
             .map_err(|e| {
-                error!("zbus signal: receive_power_states: {e}");
+                error!("zbus signal: receive_device_state: {e}");
+                e
+            })
+            .unwrap();
+        let proxy = LedProxy::new(&conn)
+            .await
+            .map_err(|e| {
+                error!("zbus signal: receive_device_state: {e}");
+                e
+            })
+            .unwrap();
+        if let Ok(mut p) = proxy.receive_notify_power_states().await {
+            info!("Started zbus signal thread: receive_notify_power_states");
+            while let Some(e) = p.next().await {
+                if let Ok(out) = e.args() {
+                    if let Ok(mut lock) = page_states1.lock() {
+                        lock.aura.enabled = out.data;
+                        lock.set_notified();
+                    }
+                }
+            }
+        };
+    });
+
+    let page_states1 = page_states.clone();
+    tokio::spawn(async move {
+        let conn = zbus::Connection::system()
+            .await
+            .map_err(|e| {
+                error!("zbus signal: receive_device_state: {e}");
                 e
             })
             .unwrap();
         let proxy = AnimeProxy::new(&conn)
             .await
             .map_err(|e| {
-                error!("zbus signal: receive_power_states: {e}");
+                error!("zbus signal: receive_device_state: {e}");
                 e
             })
             .unwrap();
         if let Ok(p) = proxy.receive_device_state().await {
-            info!("Started zbus signal thread: receive_power_states");
+            info!("Started zbus signal thread: receive_device_state");
             p.for_each(|_| {
                 if let Ok(_lock) = page_states1.lock() {
                     // TODO: lock.anime.
@@ -320,7 +349,7 @@ pub fn start_notifications(
         }
 
         if let Ok(mut p) = proxy.receive_notify_gpu_mux_mode().await {
-            info!("Started zbus signal thread: receive_power_states");
+            info!("Started zbus signal thread: receive_notify_gpu_mux_mode");
             while let Some(e) = p.next().await {
                 if let Ok(out) = e.args() {
                     if out.mode == actual_mux_mode {

rog-control-center/src/widgets/aura_power.rs

@@ -1,12 +1,12 @@
 use egui::{RichText, Ui};
-use rog_aura::usb::{AuraDevRog1, AuraDevRog2, AuraDevTuf, AuraDevice, AuraPowerDev};
-use rog_aura::AuraZone;
+use rog_aura::power::{AuraPower, KbAuraPowerState};
+use rog_aura::usb::{AuraDevRog1, AuraDevTuf, AuraDevice, AuraPowerDev};
 use rog_platform::supported::SupportedFunctions;
 
 use crate::system_state::SystemState;
 
 pub fn aura_power_group(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
-    ui.heading("LED settings");
+    ui.heading("Keyboard LED power settings");
 
     match supported.keyboard_led.dev_id {
         AuraDevice::X1854 | AuraDevice::X1869 | AuraDevice::X1866 => {
@@ -22,10 +22,10 @@ pub fn aura_power_group(supported: &SupportedFunctions, states: &mut SystemState
 
 fn aura_power1(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
     let enabled_states = &mut states.aura.enabled;
-    let mut boot = enabled_states.x1866.contains(&AuraDevRog1::Boot);
-    let mut sleep = enabled_states.x1866.contains(&AuraDevRog1::Sleep);
-    let mut keyboard = enabled_states.x1866.contains(&AuraDevRog1::Keyboard);
-    let mut lightbar = enabled_states.x1866.contains(&AuraDevRog1::Lightbar);
+    let mut boot = enabled_states.old_rog.contains(&AuraDevRog1::Boot);
+    let mut sleep = enabled_states.old_rog.contains(&AuraDevRog1::Sleep);
+    let mut keyboard = enabled_states.old_rog.contains(&AuraDevRog1::Keyboard);
+    let mut lightbar = enabled_states.old_rog.contains(&AuraDevRog1::Lightbar);
     if supported.keyboard_led.dev_id == AuraDevice::Tuf {
         boot = enabled_states.tuf.contains(&AuraDevTuf::Boot);
         sleep = enabled_states.tuf.contains(&AuraDevTuf::Sleep);
@@ -130,8 +130,7 @@ fn aura_power1(supported: &SupportedFunctions, states: &mut SystemState, ui: &mu
             let mut send = |enable: bool, data: Vec<AuraDevTuf>| {
                 let options = AuraPowerDev {
                     tuf: data,
-                    x1866: vec![],
-                    x19b6: vec![],
+                    ..Default::default()
                 };
                 // build data to send
                 states
@@ -153,21 +152,21 @@ fn aura_power1(supported: &SupportedFunctions, states: &mut SystemState, ui: &mu
             let mut modify_x1866 = |b: bool, a: AuraDevRog1| {
                 if b {
                     enabled.push(a);
-                    if !enabled_states.x1866.contains(&a) {
-                        enabled_states.x1866.push(a);
+                    if !enabled_states.old_rog.contains(&a) {
+                        enabled_states.old_rog.push(a);
                     }
                 } else {
                     disabled.push(a);
                     // This would be so much better as a hashset
-                    if enabled_states.x1866.contains(&a) {
+                    if enabled_states.old_rog.contains(&a) {
                         let mut idx = 0;
-                        for (i, n) in enabled_states.x1866.iter().enumerate() {
+                        for (i, n) in enabled_states.old_rog.iter().enumerate() {
                             if *n == a {
                                 idx = i;
                                 break;
                             }
                         }
-                        enabled_states.x1866.remove(idx);
+                        enabled_states.old_rog.remove(idx);
                     }
                 }
             };
@@ -180,9 +179,8 @@ fn aura_power1(supported: &SupportedFunctions, states: &mut SystemState, ui: &mu
 
             let mut send = |enable: bool, data: Vec<AuraDevRog1>| {
                 let options = AuraPowerDev {
-                    tuf: vec![],
-                    x1866: data,
-                    x19b6: vec![],
+                    old_rog: data,
+                    ..Default::default()
                 };
                 // build data to send
                 states
@@ -202,115 +200,52 @@ fn aura_power1(supported: &SupportedFunctions, states: &mut SystemState, ui: &mu
 }
 
 fn aura_power2(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
-    let enabled_states = &mut states.aura.enabled;
-    let has_logo = supported.keyboard_led.basic_zones.contains(&AuraZone::Logo);
-    let has_lightbar = supported
-        .keyboard_led
-        .basic_zones
-        .contains(&AuraZone::BarLeft)
-        || supported
-            .keyboard_led
-            .basic_zones
-            .contains(&AuraZone::BarRight);
+    let AuraPower {
+        keyboard,
+        logo,
+        lightbar,
+        lid,
+        rear_glow,
+    } = &mut states.aura.enabled.rog;
 
-    let boot_bar = &mut enabled_states.x19b6.contains(&AuraDevRog2::AwakeBar);
-    let boot_logo = &mut enabled_states.x19b6.contains(&AuraDevRog2::BootLogo);
-    let boot_keyb = &mut enabled_states.x19b6.contains(&AuraDevRog2::BootKeyb);
-
-    let awake_bar = &mut enabled_states.x19b6.contains(&AuraDevRog2::BootBar);
-    let awake_logo = &mut enabled_states.x19b6.contains(&AuraDevRog2::AwakeLogo);
-    let awake_keyb = &mut enabled_states.x19b6.contains(&AuraDevRog2::AwakeKeyb);
-
-    let sleep_bar = &mut enabled_states.x19b6.contains(&AuraDevRog2::SleepBar);
-    let sleep_logo = &mut enabled_states.x19b6.contains(&AuraDevRog2::SleepLogo);
-    let sleep_keyb = &mut enabled_states.x19b6.contains(&AuraDevRog2::SleepKeyb);
+    const LABELS: [&str; 4] = ["Boot", "Awake", "Sleep", "Shutdown"];
 
     let mut changed = false;
-
-    let mut item = |keyboard: &mut bool, logo: &mut bool, lightbar: &mut bool, ui: &mut Ui| {
-        ui.horizontal_wrapped(|ui| {
-            if ui.checkbox(keyboard, "Keyboard").changed() {
-                changed = true;
-            }
-            if has_logo && ui.checkbox(logo, "Logo").changed() {
-                changed = true;
-            }
-            if has_lightbar && ui.checkbox(lightbar, "Lightbar").changed() {
-                changed = true;
+    let mut item = |power: &mut KbAuraPowerState, ui: &mut Ui| {
+        ui.vertical(|ui| {
+            if supported.keyboard_led.power_zones.contains(&power.zone) {
+                ui.horizontal_wrapped(|ui| {
+                    ui.label(RichText::new(format!("{:?}", power.zone)).size(14.0));
+                });
+                if ui.checkbox(&mut power.boot, LABELS[0]).changed() {
+                    changed = true;
+                }
+                if ui.checkbox(&mut power.awake, LABELS[1]).changed() {
+                    changed = true;
+                }
+                if ui.checkbox(&mut power.sleep, LABELS[2]).changed() {
+                    changed = true;
+                }
+                if ui.checkbox(&mut power.shutdown, LABELS[3]).changed() {
+                    changed = true;
+                }
             }
         });
     };
 
     ui.horizontal_wrapped(|ui| {
-        ui.vertical(|ui| {
-            let h = 16.0;
-            ui.set_row_height(22.0);
-            ui.horizontal_wrapped(|ui| {
-                ui.label(RichText::new("Boot").size(h));
-            });
-            ui.horizontal_wrapped(|ui| {
-                ui.label(RichText::new("Awake").size(h));
-            });
-            ui.horizontal_wrapped(|ui| {
-                ui.label(RichText::new("Sleep").size(h));
-            });
-        });
-        ui.vertical(|ui| {
-            ui.set_row_height(22.0);
-            item(boot_keyb, boot_logo, boot_bar, ui);
-            item(awake_keyb, awake_logo, awake_bar, ui);
-            item(sleep_keyb, sleep_logo, sleep_bar, ui);
-        });
+        item(lid, ui);
+        item(logo, ui);
+        item(keyboard, ui);
+        item(lightbar, ui);
+        item(rear_glow, ui);
     });
 
     if changed {
-        let mut enabled = Vec::new();
-        let mut disabled = Vec::new();
-
-        let mut modify = |b: bool, a: AuraDevRog2| {
-            if b {
-                enabled.push(a);
-                if !enabled_states.x19b6.contains(&a) {
-                    enabled_states.x19b6.push(a);
-                }
-            } else {
-                disabled.push(a);
-                // This would be so much better as a hashset
-                if enabled_states.x19b6.contains(&a) {
-                    let mut idx = 0;
-                    for (i, n) in enabled_states.x19b6.iter().enumerate() {
-                        if *n == a {
-                            idx = i;
-                            break;
-                        }
-                    }
-                    enabled_states.x19b6.remove(idx);
-                }
-            }
-        };
-        modify(*boot_keyb, AuraDevRog2::BootKeyb);
-        modify(*sleep_keyb, AuraDevRog2::SleepKeyb);
-        modify(*awake_keyb, AuraDevRog2::AwakeKeyb);
-        if supported.keyboard_led.basic_zones.contains(&AuraZone::Logo) {
-            modify(*boot_logo, AuraDevRog2::BootLogo);
-            modify(*sleep_logo, AuraDevRog2::SleepLogo);
-            modify(*awake_logo, AuraDevRog2::AwakeLogo);
-        }
-        if supported
-            .keyboard_led
-            .basic_zones
-            .contains(&AuraZone::BarLeft)
-        {
-            modify(*boot_bar, AuraDevRog2::AwakeBar);
-            modify(*sleep_bar, AuraDevRog2::SleepBar);
-            modify(*awake_bar, AuraDevRog2::BootBar);
-        }
-
-        let mut send = |enable: bool, data: Vec<AuraDevRog2>| {
+        let mut send = |enable: bool, data: AuraPower| {
             let options = AuraPowerDev {
-                tuf: vec![],
-                x1866: vec![],
-                x19b6: data,
+                rog: data,
+                ..Default::default()
             };
             // build data to send
             states
@@ -323,7 +258,15 @@ fn aura_power2(supported: &SupportedFunctions, states: &mut SystemState, ui: &mu
                 })
                 .ok();
         };
-        send(true, enabled);
-        send(false, disabled);
+        send(
+            true,
+            AuraPower {
+                keyboard: *keyboard,
+                logo: *logo,
+                lightbar: *lightbar,
+                lid: *lid,
+                rear_glow: *rear_glow,
+            },
+        );
     }
 }

rog-control-center/src/widgets/fan_graph.rs

@@ -1,6 +1,7 @@
 use egui::plot::Points;
 use egui::Ui;
 use rog_platform::supported::SupportedFunctions;
+use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::{FanCurvePU, Profile};
 
 use crate::system_state::FanCurvesState;
@@ -15,20 +16,36 @@ pub fn fan_graphs(
 ) {
     ui.separator();
 
-    let mut item = |p: Profile, ui: &mut Ui| {
+    let mut item = |profile: Profile, ui: &mut Ui| {
         ui.group(|ui| {
-            ui.selectable_value(&mut curves.show_curve, p, format!("{p:?}"));
-            ui.add_enabled_ui(curves.show_curve == p, |ui| {
-                ui.selectable_value(
-                    &mut curves.show_graph,
-                    FanCurvePU::CPU,
-                    format!("{:?}", FanCurvePU::CPU),
-                );
-                ui.selectable_value(
-                    &mut curves.show_graph,
-                    FanCurvePU::GPU,
-                    format!("{:?}", FanCurvePU::GPU),
-                );
+            if ui
+                .selectable_value(&mut curves.show_curve, profile, format!("{profile:?}"))
+                .clicked()
+            {
+                dbus.proxies().profile().set_active_profile(profile).ok();
+            }
+            ui.add_enabled_ui(curves.show_curve == profile, |ui| {
+                if curves.available_fans.contains(&FanCurvePU::CPU) {
+                    ui.selectable_value(
+                        &mut curves.show_graph,
+                        FanCurvePU::CPU,
+                        format!("{:?}", FanCurvePU::CPU),
+                    );
+                }
+                if curves.available_fans.contains(&FanCurvePU::GPU) {
+                    ui.selectable_value(
+                        &mut curves.show_graph,
+                        FanCurvePU::GPU,
+                        format!("{:?}", FanCurvePU::GPU),
+                    );
+                }
+                if curves.available_fans.contains(&FanCurvePU::MID) {
+                    ui.selectable_value(
+                        &mut curves.show_graph,
+                        FanCurvePU::MID,
+                        format!("{:?}", FanCurvePU::MID),
+                    );
+                }
             });
         });
     };
@@ -43,11 +60,13 @@ pub fn fan_graphs(
 
     use egui::plot::{Line, Plot};
 
-    let data = if curves.show_graph == FanCurvePU::CPU {
-        &mut curve.cpu
-    } else {
-        &mut curve.gpu
-    };
+    let mut data = &mut CurveData::default();
+    for c in curve {
+        if c.fan == curves.show_graph {
+            data = c;
+            break;
+        }
+    }
 
     let mut points: Vec<[f64; 2]> = data
         .temp

rog-control-center/src/widgets/side_panel.rs

@@ -18,7 +18,7 @@ impl RogApp {
                     *page = Page::System;
                 }
 
-                if self.supported.platform_profile.fan_curves {
+                if !self.supported.platform_profile.fans.is_empty() {
                     ui.separator();
                     if ui
                         .selectable_value(page, Page::FanCurves, "Fan Curves")

rog-dbus/src/zbus_led.rs

@@ -79,7 +79,7 @@ trait Led {
 
     // As property doesn't work for AuraPowerDev (complexity of serialization?)
     // #[dbus_proxy(property)]
-    fn led_powered(&self) -> zbus::Result<AuraPowerDev>;
+    fn led_power(&self) -> zbus::Result<AuraPowerDev>;
 }
 
 pub struct LedProxyPerkey<'a>(LedProxyBlocking<'a>);

rog-dbus/src/zbus_profile.rs

@@ -20,8 +20,8 @@
 //!
 //! …consequently `zbus-xmlgen` did not generate code for the above interfaces.
 
-use rog_profiles::fan_curve_set::{CurveData, FanCurveSet};
-use rog_profiles::Profile;
+use rog_profiles::fan_curve_set::CurveData;
+use rog_profiles::{FanCurvePU, Profile};
 use zbus::dbus_proxy;
 
 #[dbus_proxy(
@@ -30,14 +30,11 @@ use zbus::dbus_proxy;
 )]
 trait Profile {
     /// Get the fan-curve data for the currently active Profile
-    fn fan_curve_data(&self, profile: Profile) -> zbus::Result<FanCurveSet>;
+    fn fan_curve_data(&self, profile: Profile) -> zbus::Result<Vec<CurveData>>;
 
     /// Fetch the active profile name
     fn active_profile(&self) -> zbus::Result<Profile>;
 
-    /// Get a list of profiles that have fan-curves enabled.
-    fn enabled_fan_profiles(&self) -> zbus::Result<Vec<Profile>>;
-
     /// Toggle to next platform_profile. Names provided by `Profiles`.
     /// If fan-curves are supported will also activate a fan curve for profile.
     fn next_profile(&self) -> zbus::Result<()>;
@@ -49,7 +46,16 @@ trait Profile {
     fn set_active_profile(&self, profile: Profile) -> zbus::Result<()>;
 
     /// Set a profile fan curve enabled status. Will also activate a fan curve.
-    fn set_fan_curve_enabled(&self, profile: Profile, enabled: bool) -> zbus::Result<()>;
+    fn set_fan_curves_enabled(&self, profile: Profile, enabled: bool) -> zbus::Result<()>;
+
+    /// Set a single fan curve for a profile to enabled status. Will also
+    /// activate a fan curve.
+    async fn set_profile_fan_curve_enabled(
+        &self,
+        profile: Profile,
+        fan: FanCurvePU,
+        enabled: bool,
+    ) -> zbus::Result<()>;
 
     /// Set the fan curve for the specified profile, or the profile the user is
     /// currently in if profile == None. Will also activate the fan curve.

rog-platform/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 [dependencies]
 log.workspace = true
 rog_aura = { path = "../rog-aura" }
+rog_profiles = { path = "../rog-profiles" }
 serde.workspace = true
 serde_derive.workspace = true
 zbus.workspace = true