Merge branch 'fix/one-shot-charge-persistence' into 'devel'

fix: one-shot charging loses original charge limit after restart

See merge request asus-linux/asusctl!242

CHANGELOG.md

@@ -4,9 +4,6 @@
 
 ### Changed
 - Added support for TUF keyboard powerstate control
-- Improved AniMe Matrix support thanks to @Seom1177 !
-- Fixed a bug with one-shot battery change, thanks @bitr8 !
-- Changed the CLI interface of asusctl to be less confusing
 
 ## [6.2.0]
 

Cargo.toml

@@ -44,7 +44,7 @@ smol = "^2.0"
 mio = "0.8.11"
 
 futures-util = "0.3.31"
-zbus = "5.13.1"
+zbus = "5.5.0"
 logind-zbus = { version = "5.2.0" } #, default-features = false, features = ["non_blocking"] }
 
 serde = { version = "^1.0", features = ["serde_derive"] }

asusctl/Cargo.toml

@@ -24,7 +24,6 @@ env_logger.workspace = true
 ron.workspace = true
 gumdrop.workspace = true
 zbus.workspace = true
-argh = "0.1"
 
 [dev-dependencies]
 rog_dbus = { path = "../rog-dbus" }

asusctl/src/anime_cli.rs

@@ -1,151 +1,154 @@
-use argh::FromArgs;
-use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping};
+use gumdrop::Options;
+use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping, Brightness};
 use rog_anime::AnimeType;
 
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "anime", description = "anime commands")]
+#[derive(Options)]
 pub struct AnimeCommand {
-    #[argh(option, description = "override the display type")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "override the display type")]
     pub override_type: Option<AnimeType>,
-    #[argh(option, description = "enable/disable the display")]
+    #[options(meta = "", help = "enable/disable the display")]
     pub enable_display: Option<bool>,
-    #[argh(
-        option,
-        description = "enable/disable the builtin run/powersave animation"
-    )]
+    #[options(meta = "", help = "enable/disable the builtin run/powersave animation")]
     pub enable_powersave_anim: Option<bool>,
-    #[argh(
-        option,
-        description = "set global base brightness value <off, low, med, high>"
+    #[options(
+        meta = "",
+        help = "set global base brightness value <Off, Low, Med, High>"
     )]
-    pub brightness: Option<rog_anime::usb::Brightness>,
-    #[argh(switch, description = "clear the display")]
+    pub brightness: Option<Brightness>,
+    #[options(help = "clear the display")]
     pub clear: bool,
-    #[argh(
-        option,
-        description = "turn the anime off when external power is unplugged"
+    #[options(
+        no_short,
+        meta = "",
+        help = "turn the anime off when external power is unplugged"
     )]
     pub off_when_unplugged: Option<bool>,
-    #[argh(option, description = "turn the anime off when the laptop suspends")]
+    #[options(
+        no_short,
+        meta = "",
+        help = "turn the anime off when the laptop suspends"
+    )]
     pub off_when_suspended: Option<bool>,
-    #[argh(option, description = "turn the anime off when the lid is closed")]
+    #[options(
+        no_short,
+        meta = "",
+        help = "turn the anime off when the lid is closed"
+    )]
     pub off_when_lid_closed: Option<bool>,
-    #[argh(option, description = "off with his head!!!")]
+    #[options(no_short, meta = "", help = "Off with his head!!!")]
     pub off_with_his_head: Option<bool>,
-    #[argh(subcommand)]
+    #[options(command)]
     pub command: Option<AnimeActions>,
 }
 
-/// Anime subcommands (image, gif, builtins, etc.)
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+#[derive(Options)]
 pub enum AnimeActions {
+    #[options(help = "display a PNG image")]
     Image(AnimeImage),
+    #[options(help = "display a diagonal/pixel-perfect PNG")]
     PixelImage(AnimeImageDiagonal),
+    #[options(help = "display an animated GIF")]
     Gif(AnimeGif),
+    #[options(help = "display an animated diagonal/pixel-perfect GIF")]
     PixelGif(AnimeGifDiagonal),
+    #[options(help = "change which builtin animations are shown")]
     SetBuiltins(Builtins),
 }
 
-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "set-builtins",
-    description = "change which builtin animations are shown"
-)]
+#[derive(Options)]
 pub struct Builtins {
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
     )]
     pub boot: AnimBooting,
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
     )]
     pub awake: AnimAwake,
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:BannerSwipe, Starfield>"
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:BannerSwipe, Starfield>"
     )]
     pub sleep: AnimSleeping,
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:GlitchOut, SeeYa>"
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:GlitchOut, SeeYa>"
     )]
     pub shutdown: AnimShutdown,
-    #[argh(option, description = "set/apply the animations <true/false>")]
+    #[options(meta = "", help = "set/apply the animations <true/false>")]
     pub set: Option<bool>,
 }
 
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "image", description = "display a PNG image")]
+#[derive(Options)]
 pub struct AnimeImage {
-    #[argh(option, description = "full path to the png to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
     pub path: String,
-    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
+    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
     pub scale: f32,
-    #[argh(option, default = "0.0", description = "x position (float)")]
+    #[options(meta = "", default = "0.0", help = "x position (float)")]
     pub x_pos: f32,
-    #[argh(option, default = "0.0", description = "y position (float)")]
+    #[options(meta = "", default = "0.0", help = "y position (float)")]
     pub y_pos: f32,
-    #[argh(option, default = "0.0", description = "the angle in radians")]
+    #[options(meta = "", default = "0.0", help = "the angle in radians")]
     pub angle: f32,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
     pub bright: f32,
 }
 
-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "pixel-image",
-    description = "display a diagonal/pixel-perfect PNG"
-)]
+#[derive(Options)]
 pub struct AnimeImageDiagonal {
-    #[argh(option, description = "full path to the png to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
     pub path: String,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
     pub bright: f32,
 }
 
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "gif", description = "display an animated GIF")]
+#[derive(Options)]
 pub struct AnimeGif {
-    #[argh(option, description = "full path to the gif to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
     pub path: String,
-    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
+    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
     pub scale: f32,
-    #[argh(option, default = "0.0", description = "x position (float)")]
+    #[options(meta = "", default = "0.0", help = "x position (float)")]
     pub x_pos: f32,
-    #[argh(option, default = "0.0", description = "y position (float)")]
+    #[options(meta = "", default = "0.0", help = "y position (float)")]
     pub y_pos: f32,
-    #[argh(option, default = "0.0", description = "the angle in radians")]
+    #[options(meta = "", default = "0.0", help = "the angle in radians")]
     pub angle: f32,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
     pub bright: f32,
-    #[argh(
-        option,
+    #[options(
+        meta = "",
         default = "1",
-        description = "how many loops to play - 0 is infinite"
+        help = "how many loops to play - 0 is infinite"
     )]
     pub loops: u32,
 }
 
-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "pixel-gif",
-    description = "display an animated diagonal/pixel-perfect GIF"
-)]
+#[derive(Options)]
 pub struct AnimeGifDiagonal {
-    #[argh(option, description = "full path to the gif to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
     pub path: String,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
     pub bright: f32,
-    #[argh(
-        option,
+    #[options(
+        meta = "",
         default = "1",
-        description = "how many loops to play - 0 is infinite"
+        help = "how many loops to play - 0 is infinite"
     )]
     pub loops: u32,
 }

asusctl/src/aura_cli.rs

@@ -1,67 +1,68 @@
-use std::fmt;
 use std::str::FromStr;
 
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_aura::error::Error;
 use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed};
 
-#[derive(FromArgs, Debug, Clone)]
-#[argh(
-    subcommand,
-    name = "aura-power-old",
-    description = "aura power (old ROGs and TUF laptops)"
-)]
+#[derive(Options, Debug)]
 pub struct LedPowerCommand1 {
-    #[argh(
-        option,
-        description = "control if LEDs enabled while awake <true/false>"
-    )]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "Control if LEDs enabled while awake <true/false>")]
     pub awake: Option<bool>,
-
-    #[argh(
-        switch,
-        description = "use with awake option; if excluded defaults to false"
-    )]
+    #[options(help = "Use with awake option, if excluded defaults to false")]
     pub keyboard: bool,
-
-    #[argh(
-        switch,
-        description = "use with awake option; if excluded defaults to false"
-    )]
+    #[options(help = "Use with awake option, if excluded defaults to false")]
     pub lightbar: bool,
-
-    #[argh(option, description = "control boot animations <true/false>")]
+    #[options(meta = "", help = "Control boot animations <true/false>")]
     pub boot: Option<bool>,
-
-    #[argh(option, description = "control suspend animations <true/false>")]
+    #[options(meta = "", help = "Control suspend animations <true/false>")]
     pub sleep: Option<bool>,
 }
 
-#[derive(FromArgs, Debug, Clone)]
-#[argh(subcommand, name = "aura-power", description = "aura power")]
+#[derive(Options, Debug)]
 pub struct LedPowerCommand2 {
-    #[argh(subcommand)]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(command)]
     pub command: Option<SetAuraZoneEnabled>,
 }
 
-/// Subcommands to enable/disable specific aura zones
-#[derive(FromArgs, Debug, Clone)]
-#[argh(subcommand)]
+#[derive(Options, Debug)]
 pub enum SetAuraZoneEnabled {
-    Keyboard(KeyboardPower),
-    Logo(LogoPower),
-    Lightbar(LightbarPower),
-    Lid(LidPower),
-    RearGlow(RearGlowPower),
-    Ally(AllyPower),
+    /// Applies to both old and new models
+    #[options(help = "")]
+    Keyboard(AuraPowerStates),
+    #[options(help = "")]
+    Logo(AuraPowerStates),
+    #[options(help = "")]
+    Lightbar(AuraPowerStates),
+    #[options(help = "")]
+    Lid(AuraPowerStates),
+    #[options(help = "")]
+    RearGlow(AuraPowerStates),
+    #[options(help = "")]
+    Ally(AuraPowerStates),
 }
 
-/// Keyboard brightness argument helper
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Options)]
+pub struct AuraPowerStates {
+    #[options(help = "print help message")]
+    pub help: 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,
+}
+
+#[derive(Options)]
 pub struct LedBrightness {
     level: Option<u8>,
 }
-
 impl LedBrightness {
     pub fn new(level: Option<u8>) -> Self {
         LedBrightness { level }
@@ -71,302 +72,176 @@ impl LedBrightness {
         self.level
     }
 }
-
 impl FromStr for LedBrightness {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let s = s.to_lowercase();
         match s.as_str() {
-            "off" => Ok(Self::new(Some(0x00))),
-            "low" => Ok(Self::new(Some(0x01))),
-            "med" => Ok(Self::new(Some(0x02))),
-            "high" => Ok(Self::new(Some(0x03))),
-            _ => Err(Error::ParseBrightness),
+            "off" => Ok(LedBrightness { level: Some(0x00) }),
+            "low" => Ok(LedBrightness { level: Some(0x01) }),
+            "med" => Ok(LedBrightness { level: Some(0x02) }),
+            "high" => Ok(LedBrightness { level: Some(0x03) }),
+            _ => {
+                print!("Invalid argument, must be one of: off, low, med, high");
+                Err(Error::ParseBrightness)
+            }
         }
     }
 }
-
-impl fmt::Display for LedBrightness {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+#[allow(clippy::to_string_trait_impl)]
+impl ToString for LedBrightness {
+    fn to_string(&self) -> String {
         let s = match self.level {
-            Some(0x00) => "off",
-            Some(0x01) => "low",
-            Some(0x02) => "med",
-            Some(0x03) => "high",
+            Some(0x00) => "low",
+            Some(0x01) => "med",
+            Some(0x02) => "high",
             _ => "unknown",
         };
-        write!(f, "{}", s)
+        s.to_owned()
     }
 }
 
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "keyboard",
-    description = "set power states for keyboard zone"
-)]
-pub struct KeyboardPower {
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub boot: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub awake: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "logo",
-    description = "set power states for logo zone"
-)]
-pub struct LogoPower {
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub boot: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub awake: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "lightbar",
-    description = "set power states for lightbar zone"
-)]
-pub struct LightbarPower {
-    #[argh(switch, description = "enable power while device is booting")]
-    pub boot: bool,
-    #[argh(switch, description = "enable power while device is awake")]
-    pub awake: bool,
-    #[argh(switch, description = "enable power while device is sleeping")]
-    pub sleep: bool,
-    #[argh(
-        switch,
-        description = "enable power while device is shutting down or hibernating"
-    )]
-    pub shutdown: bool,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "lid",
-    description = "set power states for lid zone"
-)]
-pub struct LidPower {
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub boot: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub awake: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "rear-glow",
-    description = "set power states for rear glow zone"
-)]
-pub struct RearGlowPower {
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub boot: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub awake: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "ally",
-    description = "set power states for ally zone"
-)]
-pub struct AllyPower {
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub boot: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub awake: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[argh(switch, description = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-/// Single speed-based effect
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "rainbow-cycle",
-    description = "single speed-based effect"
-)]
+#[derive(Debug, Clone, Options, Default)]
 pub struct SingleSpeed {
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "WORD", help = "set the speed: low, med, high")]
     pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-/// Single speed effect with direction
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "rainbow-wave",
-    description = "single speed effect with direction"
-)]
+#[derive(Debug, Clone, Options, Default)]
 pub struct SingleSpeedDirection {
-    #[argh(option, description = "set the direction: up, down, left, right")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the direction: up, down, left, right")]
     pub direction: Direction,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
     pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-/// Static single-colour effect
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "static",
-    description = "static single-colour effect"
-)]
+#[derive(Debug, Clone, Default, Options)]
 pub struct SingleColour {
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour: Colour,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-/// Single-colour effect with speed
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "highlight",
-    description = "single-colour effect with speed"
-)]
+#[derive(Debug, Clone, Default, Options)]
 pub struct SingleColourSpeed {
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour: Colour,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
     pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-/// Two-colour breathing effect
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "breathe",
-    description = "two-colour breathing effect"
-)]
+#[derive(Debug, Clone, Options, Default)]
 pub struct TwoColourSpeed {
-    #[argh(option, description = "set the first RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the first RGB value e.g, ff00ff")]
     pub colour: Colour,
-
-    #[argh(option, description = "set the second RGB value e.g. ff00ff")]
+    #[options(no_long, meta = "", help = "set the second RGB value e.g, ff00ff")]
     pub colour2: Colour,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
     pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-/// Multi-zone colour settings
-#[derive(FromArgs, Debug, Clone, Default)]
+#[derive(Debug, Clone, Default, Options)]
 #[allow(dead_code)]
-#[argh(description = "multi-zone colour settings")]
 pub struct MultiZone {
-    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour1: Colour,
-
-    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour2: Colour,
-
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour3: Colour,
-
-    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour4: Colour,
 }
 
-/// Multi-colour with speed
-#[derive(FromArgs, Debug, Clone, Default)]
+#[derive(Debug, Clone, Default, Options)]
 #[allow(dead_code)]
-#[argh(description = "multi-colour with speed")]
 pub struct MultiColourSpeed {
-    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour1: Colour,
-
-    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour2: Colour,
-
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour3: Colour,
-
-    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
     pub colour4: Colour,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
     pub speed: Speed,
 }
 
-/// Builtin aura effects
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+/// Byte value for setting the built-in mode.
+///
+/// Enum corresponds to the required integer value
+// NOTE: The option names here must match those in rog-aura crate
+#[derive(Options)]
 pub enum SetAuraBuiltin {
-    Static(SingleColour),              // 0
-    Breathe(TwoColourSpeed),           // 1
-    RainbowCycle(SingleSpeed),         // 2
+    #[options(help = "set a single static colour")]
+    Static(SingleColour), // 0
+    #[options(help = "pulse between one or two colours")]
+    Breathe(TwoColourSpeed), // 1
+    #[options(help = "strobe through all colours")]
+    RainbowCycle(SingleSpeed), // 2
+    #[options(help = "rainbow cycling in one of four directions")]
     RainbowWave(SingleSpeedDirection), // 3
-    Stars(TwoColourSpeed),             // 4
-    Rain(SingleSpeed),                 // 5
-    Highlight(SingleColourSpeed),      // 6
-    Laser(SingleColourSpeed),          // 7
-    Ripple(SingleColourSpeed),         // 8
-    Pulse(SingleColour),               // 10
-    Comet(SingleColour),               // 11
-    Flash(SingleColour),               // 12
+    #[options(help = "rain pattern mimicking raindrops")]
+    Stars(TwoColourSpeed), // 4
+    #[options(help = "rain pattern of three preset colours")]
+    Rain(SingleSpeed), // 5
+    #[options(help = "pressed keys are highlighted to fade")]
+    Highlight(SingleColourSpeed), // 6
+    #[options(help = "pressed keys generate horizontal laser")]
+    Laser(SingleColourSpeed), // 7
+    #[options(help = "pressed keys ripple outwards like a splash")]
+    Ripple(SingleColourSpeed), // 8
+    #[options(help = "set a rapid pulse")]
+    Pulse(SingleColour), // 10
+    #[options(help = "set a vertical line zooming from left")]
+    Comet(SingleColour), // 11
+    #[options(help = "set a wide vertical line zooming from left")]
+    Flash(SingleColour), // 12
 }
 
 impl Default for SetAuraBuiltin {

asusctl/src/cli_opts.rs

@@ -1,4 +1,4 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_platform::platform::PlatformProfile;
 
 use crate::anime_cli::AnimeCommand;
@@ -7,308 +7,128 @@ use crate::fan_curve_cli::FanCurveCommand;
 use crate::scsi_cli::ScsiCommand;
 use crate::slash_cli::SlashCommand;
 
-#[derive(FromArgs, Default, Debug)]
-/// asusctl command-line options
+#[derive(Default, Options)]
 pub struct CliStart {
-    #[argh(subcommand)]
-    pub command: CliCommand,
+    #[options(help_flag, help = "print help message")]
+    pub help: bool,
+    #[options(help = "show program version number")]
+    pub version: bool,
+    #[options(help = "show supported functions of this laptop")]
+    pub show_supported: bool,
+    #[options(meta = "", help = "<off, low, med, high>")]
+    pub kbd_bright: Option<LedBrightness>,
+    #[options(help = "Toggle to next keyboard brightness")]
+    pub next_kbd_bright: bool,
+    #[options(help = "Toggle to previous keyboard brightness")]
+    pub prev_kbd_bright: bool,
+    #[options(meta = "", help = "Set your battery charge limit <20-100>")]
+    pub chg_limit: Option<u8>,
+    #[options(help = "Toggle one-shot battery charge to 100%")]
+    pub one_shot_chg: bool,
+    #[options(command)]
+    pub command: Option<CliCommand>,
 }
 
-/// Top-level subcommands for asusctl
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+#[derive(Options)]
 pub enum CliCommand {
+    #[options(help = "Set the keyboard lighting from built-in modes")]
     Aura(LedModeCommand),
+    #[options(help = "Set the LED power states")]
     AuraPowerOld(LedPowerCommand1),
+    #[options(help = "Set the LED power states")]
     AuraPower(LedPowerCommand2),
-    Brightness(BrightnessCommand),
+    #[options(help = "Set or select platform_profile")]
     Profile(ProfileCommand),
+    #[options(help = "Set, select, or modify fan curves if supported")]
     FanCurve(FanCurveCommand),
+    #[options(help = "Set the graphics mode (obsoleted by supergfxctl)")]
+    Graphics(GraphicsCommand),
+    #[options(name = "anime", help = "Manage AniMe Matrix")]
     Anime(AnimeCommand),
+    #[options(name = "slash", help = "Manage Slash Ledbar")]
     Slash(SlashCommand),
+    #[options(name = "scsi", help = "Manage SCSI external drive")]
     Scsi(ScsiCommand),
+    #[options(
+        help = "Change platform settings. This is a new interface exposed by the asus-armoury \
+                driver, some of the settings will be the same as the older platform interface"
+    )]
     Armoury(ArmouryCommand),
+    #[options(name = "backlight", help = "Set screen backlight levels")]
     Backlight(BacklightCommand),
-    Battery(BatteryCommand),
-    Info(InfoCommand),
 }
 
-impl Default for CliCommand {
-    fn default() -> Self {
-        CliCommand::Info(InfoCommand::default())
-    }
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "profile", description = "profile management")]
+#[derive(Debug, Clone, Options)]
 pub struct ProfileCommand {
-    #[argh(subcommand)]
-    pub command: ProfileSubCommand,
-}
+    #[options(help = "print help message")]
+    pub help: bool,
 
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
-pub enum ProfileSubCommand {
-    Next(ProfileNextCommand),
-    List(ProfileListCommand),
-    Get(ProfileGetCommand),
-    Set(ProfileSetCommand),
-}
+    #[options(help = "toggle to next profile in list")]
+    pub next: bool,
 
-impl Default for ProfileSubCommand {
-    fn default() -> Self {
-        ProfileSubCommand::List(ProfileListCommand::default())
-    }
-}
+    #[options(help = "list available profiles")]
+    pub list: bool,
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "next",
-    description = "toggle to next profile in list"
-)]
-pub struct ProfileNextCommand {}
+    #[options(help = "get profile")]
+    pub profile_get: bool,
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "list", description = "list available profiles")]
-pub struct ProfileListCommand {}
+    #[options(meta = "", help = "set the active profile")]
+    pub profile_set: Option<PlatformProfile>,
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "get", description = "get profile")]
-pub struct ProfileGetCommand {}
+    #[options(short = "a", meta = "", help = "set the profile to use on AC power")]
+    pub profile_set_ac: Option<PlatformProfile>,
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "set", description = "set profile")]
-pub struct ProfileSetCommand {
-    #[argh(positional, description = "profile to set")]
-    pub profile: PlatformProfile,
-
-    #[argh(
-        switch,
-        short = 'a',
-        description = "set the profile to use on AC power"
+    #[options(
+        short = "b",
+        meta = "",
+        help = "set the profile to use on battery power"
     )]
-    pub ac: bool,
-
-    #[argh(
-        switch,
-        short = 'b',
-        description = "set the profile to use on battery power"
-    )]
-    pub battery: bool,
+    pub profile_set_bat: Option<PlatformProfile>,
 }
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "aura", description = "led mode commands")]
+#[derive(Options)]
 pub struct LedModeCommand {
-    #[argh(switch, description = "switch to next aura mode")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(help = "switch to next aura mode")]
     pub next_mode: bool,
-
-    #[argh(switch, description = "switch to previous aura mode")]
+    #[options(help = "switch to previous aura mode")]
     pub prev_mode: bool,
-
-    #[argh(subcommand)]
+    #[options(command)]
     pub command: Option<SetAuraBuiltin>,
 }
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "armoury",
-    description = "armoury / firmware attributes"
-)]
+#[derive(Options)]
+pub struct GraphicsCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+}
+
+#[derive(Options, Debug)]
 pub struct ArmouryCommand {
-    #[argh(subcommand)]
-    pub command: ArmourySubCommand,
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
-pub enum ArmourySubCommand {
-    Set(ArmouryPropertySetCommand),
-    Get(ArmouryPropertyGetCommand),
-    List(ArmouryPropertyListCommand),
-}
-
-impl Default for ArmourySubCommand {
-    fn default() -> Self {
-        ArmourySubCommand::List(ArmouryPropertyListCommand::default())
-    }
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "set",
-    description = "set an asus-armoury firmware-attribute"
-)]
-pub struct ArmouryPropertySetCommand {
-    #[argh(
-        positional,
-        description = "name of the attribute to set (see asus-armoury list for available properties)"
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(
+        free,
+        help = "append each value name followed by the value to set. `-1` sets to default"
     )]
-    pub property: String,
-
-    #[argh(positional, description = "value to set for the given attribute")]
-    pub value: i32,
+    pub free: Vec<String>,
 }
 
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "list",
-    description = "list all firmware-attributes supported by asus-armoury"
-)]
-pub struct ArmouryPropertyListCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "get",
-    description = "get a firmware-attribute from asus-armoury"
-)]
-pub struct ArmouryPropertyGetCommand {
-    #[argh(
-        positional,
-        description = "name of the property to get (see asus-armoury list for available properties)"
-    )]
-    pub property: String,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "backlight", description = "backlight options")]
+#[derive(Options)]
 pub struct BacklightCommand {
-    #[argh(option, description = "set screen brightness <0-100>")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "Set screen brightness <0-100>")]
     pub screenpad_brightness: Option<i32>,
-
-    #[argh(
-        option,
-        description = "set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
+    #[options(
+        meta = "",
+        help = "Set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
     )]
     pub screenpad_gamma: Option<f32>,
-
-    #[argh(
-        option,
-        description = "set screenpad brightness to sync with primary display"
+    #[options(
+        meta = "",
+        help = "Set screenpad brightness to sync with primary display"
     )]
     pub sync_screenpad_brightness: Option<bool>,
 }
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "battery", description = "battery options")]
-pub struct BatteryCommand {
-    #[argh(subcommand)]
-    pub command: BatterySubCommand,
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
-pub enum BatterySubCommand {
-    Limit(BatteryLimitCommand),
-    OneShot(BatteryOneShotCommand),
-    Info(BatteryInfoCommand),
-}
-
-impl Default for BatterySubCommand {
-    fn default() -> Self {
-        BatterySubCommand::OneShot(BatteryOneShotCommand::default())
-    }
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "limit",
-    description = "set battery charge limit <20-100>"
-)]
-pub struct BatteryLimitCommand {
-    #[argh(positional, description = "charge limit percentage 20-100")]
-    pub limit: u8,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "oneshot",
-    description = "one-shot full charge (optional percent)"
-)]
-pub struct BatteryOneShotCommand {
-    #[argh(positional, description = "optional target percent (defaults to 100)")]
-    pub percent: Option<u8>,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "info",
-    description = "show current battery charge limit"
-)]
-pub struct BatteryInfoCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "info",
-    description = "show program version and system info"
-)]
-pub struct InfoCommand {
-    #[argh(switch, description = "show supported functions of this laptop")]
-    pub show_supported: bool,
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "leds", description = "keyboard brightness control")]
-pub struct BrightnessCommand {
-    #[argh(subcommand)]
-    pub command: BrightnessSubCommand,
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
-pub enum BrightnessSubCommand {
-    Set(BrightnessSetCommand),
-    Get(BrightnessGetCommand),
-    Next(BrightnessNextCommand),
-    Prev(BrightnessPrevCommand),
-}
-
-impl Default for BrightnessSubCommand {
-    fn default() -> Self {
-        BrightnessSubCommand::Get(BrightnessGetCommand::default())
-    }
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "set",
-    description = "set keyboard brightness <off, low, med, high>"
-)]
-pub struct BrightnessSetCommand {
-    #[argh(positional, description = "brightness level: off, low, med, high")]
-    pub level: LedBrightness,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "get",
-    description = "get current keyboard brightness"
-)]
-pub struct BrightnessGetCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "next",
-    description = "toggle to next keyboard brightness"
-)]
-pub struct BrightnessNextCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "prev",
-    description = "toggle to previous keyboard brightness"
-)]
-pub struct BrightnessPrevCommand {}

asusctl/src/fan_curve_cli.rs

@@ -1,44 +1,49 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;
 
-#[derive(FromArgs, Debug, Clone)]
-#[argh(subcommand, name = "fan-curve", description = "fan curve commands")]
+#[derive(Debug, Clone, Options)]
 pub struct FanCurveCommand {
-    #[argh(switch, description = "get enabled fan profiles")]
+    #[options(help = "print help message")]
+    pub help: bool,
+
+    #[options(help = "get enabled fan profiles")]
     pub get_enabled: bool,
 
-    #[argh(switch, description = "set the active profile's fan curve to default")]
+    #[options(help = "set the active profile's fan curve to default")]
     pub default: bool,
 
-    #[argh(
-        option,
-        description = "profile to modify fan-curve for. shows data if no options provided"
+    #[options(
+        meta = "",
+        help = "profile to modify fan-curve for. Shows data if no options provided"
     )]
     pub mod_profile: Option<PlatformProfile>,
 
-    #[argh(
-        option,
-        description = "enable or disable <true/false> fan all curves for a profile; --mod_profile required"
+    #[options(
+        meta = "",
+        help = "enable or disable <true/false> fan all curves for a profile. `--mod_profile` \
+                required"
     )]
     pub enable_fan_curves: Option<bool>,
 
-    #[argh(
-        option,
-        description = "enable or disable <true/false> a single fan curve for a profile; --mod_profile and --fan required"
+    #[options(
+        meta = "",
+        help = "enable or disable <true/false> a single fan curve for a profile. `--mod_profile` \
+                and `--fan` required"
     )]
     pub enable_fan_curve: Option<bool>,
 
-    #[argh(
-        option,
-        description = "select fan <cpu/gpu/mid> to modify; --mod_profile required"
+    #[options(
+        meta = "",
+        help = "select fan <cpu/gpu/mid> to modify. `--mod_profile` required"
     )]
     pub fan: Option<FanCurvePU>,
 
-    #[argh(
-        option,
-        description = "data format = 30c:1%,49c:2%,...; --mod-profile required. If '%' is omitted the fan range is 0-255"
+    #[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"
     )]
     pub data: Option<CurveData>,
 }

asusctl/src/main.rs

@@ -1,4 +1,5 @@
 use std::convert::TryFrom;
+use std::env::args;
 use std::path::Path;
 use std::process::Command;
 use std::thread::sleep;
@@ -7,11 +8,12 @@ use anime_cli::{AnimeActions, AnimeCommand};
 use aura_cli::{LedPowerCommand1, LedPowerCommand2};
 use dmi_id::DMIID;
 use fan_curve_cli::FanCurveCommand;
+use gumdrop::{Opt, Options};
 use log::{error, info, LevelFilter};
 use rog_anime::usb::get_anime_type;
 use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
 use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
-use rog_aura::{self, AuraEffect, PowerZones};
+use rog_aura::{self, AuraDeviceType, AuraEffect, PowerZones};
 use rog_dbus::asus_armoury::AsusArmouryProxyBlocking;
 use rog_dbus::list_iface_blocking;
 use rog_dbus::scsi_aura::ScsiAuraProxyBlocking;
@@ -30,6 +32,7 @@ use scsi_cli::ScsiCommand;
 use zbus::blocking::proxy::ProxyImpl;
 use zbus::blocking::Connection;
 
+use crate::aura_cli::{AuraPowerStates, LedBrightness};
 use crate::cli_opts::*;
 use crate::slash_cli::SlashCommand;
 
@@ -53,7 +56,22 @@ fn main() {
         .format_timestamp(None)
         .init();
 
-    let parsed: CliStart = argh::from_env();
+    let self_version = env!("CARGO_PKG_VERSION");
+    println!("Starting version {self_version}");
+    let args: Vec<String> = args().skip(1).collect();
+
+    let missing_argument_k = gumdrop::Error::missing_argument(Opt::Short('k'));
+    let parsed = match CliStart::parse_args_default(&args) {
+        Ok(p) => p,
+        Err(err) if err.to_string() == missing_argument_k.to_string() => CliStart {
+            kbd_bright: Some(LedBrightness::new(None)),
+            ..Default::default()
+        },
+        Err(err) => {
+            println!("Error: {}", err);
+            return;
+        }
+    };
 
     let conn = Connection::system().unwrap();
     if let Ok(platform_proxy) = PlatformProxyBlocking::new(&conn).map_err(|e| {
@@ -72,7 +90,6 @@ fn main() {
             }
         };
 
-        let self_version = env!("CARGO_PKG_VERSION");
         if asusd_version != self_version {
             println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
             return;
@@ -93,6 +110,12 @@ fn main() {
             }
         };
 
+        if parsed.version {
+            println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
+            println!();
+            print_info();
+        }
+
         if let Err(err) = do_parsed(&parsed, &supported_interfaces, &supported_properties, conn) {
             print_error_help(&*err, &supported_interfaces, &supported_properties);
         }
@@ -119,9 +142,9 @@ fn print_info() {
     let dmi = DMIID::new().unwrap_or_default();
     let board_name = dmi.board_name;
     let prod_family = dmi.product_family;
-    println!("Software version: {}", env!("CARGO_PKG_VERSION"));
-    println!("  Product family: {}", prod_family.trim());
-    println!("      Board name: {}", board_name.trim());
+    println!("asusctl version: {}", env!("CARGO_PKG_VERSION"));
+    println!(" Product family: {}", prod_family.trim());
+    println!("     Board name: {}", board_name.trim());
 }
 
 fn check_service(name: &str) -> bool {
@@ -186,63 +209,149 @@ fn do_parsed(
     conn: Connection,
 ) -> Result<(), Box<dyn std::error::Error>> {
     match &parsed.command {
-        CliCommand::Aura(mode) => handle_led_mode(mode)?,
-        CliCommand::AuraPowerOld(pow) => handle_led_power1(pow)?,
-        CliCommand::AuraPower(pow) => handle_led_power2(pow)?,
-        CliCommand::Brightness(cmd) => handle_brightness(cmd)?,
-        CliCommand::Profile(cmd) => handle_throttle_profile(&conn, supported_properties, cmd)?,
-        CliCommand::FanCurve(cmd) => handle_fan_curve(&conn, cmd)?,
-        CliCommand::Anime(cmd) => handle_anime(cmd)?,
-        CliCommand::Slash(cmd) => handle_slash(cmd)?,
-        CliCommand::Scsi(cmd) => handle_scsi(cmd)?,
-        CliCommand::Armoury(cmd) => handle_armoury_command(cmd)?,
-        CliCommand::Backlight(cmd) => handle_backlight(cmd)?,
-        CliCommand::Battery(cmd) => handle_battery(cmd, &conn)?,
-        CliCommand::Info(info_opt) => {
-            handle_info(info_opt, supported_interfaces, supported_properties)?
+        Some(CliCommand::Aura(mode)) => handle_led_mode(mode)?,
+        Some(CliCommand::AuraPowerOld(pow)) => handle_led_power1(pow)?,
+        Some(CliCommand::AuraPower(pow)) => handle_led_power2(pow)?,
+        Some(CliCommand::Profile(cmd)) => {
+            handle_throttle_profile(&conn, supported_properties, cmd)?
         }
-    }
-
-    Ok(())
-}
-
-fn handle_battery(
-    cmd: &BatteryCommand,
-    conn: &Connection,
-) -> Result<(), Box<dyn std::error::Error>> {
-    match &cmd.command {
-        BatterySubCommand::Limit(l) => {
-            let proxy = PlatformProxyBlocking::new(conn)?;
-            proxy.set_charge_control_end_threshold(l.limit)?;
+        Some(CliCommand::FanCurve(cmd)) => {
+            handle_fan_curve(&conn, cmd)?;
         }
-        BatterySubCommand::OneShot(o) => {
-            let proxy = PlatformProxyBlocking::new(conn)?;
-            if let Some(p) = o.percent {
-                proxy.set_charge_control_end_threshold(p)?;
+        Some(CliCommand::Graphics(_)) => do_gfx(),
+        Some(CliCommand::Anime(cmd)) => handle_anime(cmd)?,
+        Some(CliCommand::Slash(cmd)) => handle_slash(cmd)?,
+        Some(CliCommand::Scsi(cmd)) => handle_scsi(cmd)?,
+        Some(CliCommand::Armoury(cmd)) => handle_armoury_command(cmd)?,
+        Some(CliCommand::Backlight(cmd)) => handle_backlight(cmd)?,
+        None => {
+            if (!parsed.show_supported
+                && parsed.kbd_bright.is_none()
+                && parsed.chg_limit.is_none()
+                && !parsed.next_kbd_bright
+                && !parsed.prev_kbd_bright
+                && !parsed.one_shot_chg)
+                || parsed.help
+            {
+                println!("{}", CliStart::usage());
+                println!();
+                if let Some(cmdlist) = CliStart::command_list() {
+                    let dev_type =
+                        if let Ok(proxy) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
+                            // TODO: commands on all?
+                            proxy
+                                .first()
+                                .unwrap()
+                                .device_type()
+                                .unwrap_or(AuraDeviceType::Unknown)
+                        } else {
+                            AuraDeviceType::Unknown
+                        };
+                    let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
+                    for command in commands.iter().filter(|command| {
+                        if command.trim().starts_with("fan-curve")
+                            && !supported_interfaces.contains(&"xyz.ljones.FanCurves".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("aura")
+                            && !supported_interfaces.contains(&"xyz.ljones.Aura".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("anime")
+                            && !supported_interfaces.contains(&"xyz.ljones.Anime".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("slash")
+                            && !supported_interfaces.contains(&"xyz.ljones.Slash".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("platform")
+                            && !supported_interfaces.contains(&"xyz.ljones.Platform".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("armoury")
+                            && !supported_interfaces.contains(&"xyz.ljones.AsusArmoury".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("backlight")
+                            && !supported_interfaces.contains(&"xyz.ljones.Backlight".to_string())
+                        {
+                            return false;
+                        }
+
+                        if !dev_type.is_old_laptop()
+                            && !dev_type.is_tuf_laptop()
+                            && command.trim().starts_with("aura-power-old")
+                        {
+                            return false;
+                        }
+                        if !dev_type.is_new_laptop() && command.trim().starts_with("aura-power") {
+                            return false;
+                        }
+                        true
+                    }) {
+                        println!("{}", command);
+                    }
+                }
+
+                println!("\nExtra help can be requested on any command or subcommand:");
+                println!(" asusctl aura --help");
+                println!(" asusctl aura static --help");
             }
-            proxy.one_shot_full_charge()?;
-        }
-        BatterySubCommand::Info(_) => {
-            let proxy = PlatformProxyBlocking::new(conn)?;
-            let limit = proxy.charge_control_end_threshold()?;
-            println!("Current battery charge limit: {}%", limit);
         }
     }
 
-    Ok(())
-}
+    if let Some(brightness) = &parsed.kbd_bright {
+        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
+            for aura in aura.iter() {
+                match brightness.level() {
+                    None => {
+                        let level = aura.brightness()?;
+                        println!("Current keyboard led brightness: {level:?}");
+                    }
+                    Some(level) => aura.set_brightness(rog_aura::LedBrightness::from(level))?,
+                }
+            }
+        } else {
+            println!("No aura interface found");
+        }
+    }
 
-fn handle_info(
-    info_opt: &InfoCommand,
-    supported_interfaces: &[String],
-    supported_properties: &[Properties],
-) -> Result<(), Box<dyn std::error::Error>> {
-    println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
-    println!();
-    print_info();
-    println!();
+    if parsed.next_kbd_bright {
+        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
+            for aura in aura.iter() {
+                let brightness = aura.brightness()?;
+                aura.set_brightness(brightness.next())?;
+            }
+        } else {
+            println!("No aura interface found");
+        }
+    }
 
-    if info_opt.show_supported {
+    if parsed.prev_kbd_bright {
+        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
+            for aura in aura.iter() {
+                let brightness = aura.brightness()?;
+                aura.set_brightness(brightness.prev())?;
+            }
+        } else {
+            println!("No aura interface found");
+        }
+    }
+
+    if parsed.show_supported {
         println!("Supported Core Functions:\n{:#?}", supported_interfaces);
         println!(
             "Supported Platform Properties:\n{:#?}",
@@ -263,14 +372,35 @@ fn handle_info(
         }
     }
 
+    if let Some(chg_limit) = parsed.chg_limit {
+        let proxy = PlatformProxyBlocking::new(&conn)?;
+        proxy.set_charge_control_end_threshold(chg_limit)?;
+    }
+
+    if parsed.one_shot_chg {
+        let proxy = PlatformProxyBlocking::new(&conn)?;
+        proxy.one_shot_full_charge()?;
+    }
+
     Ok(())
 }
 
+fn do_gfx() {
+    println!(
+        "Please use supergfxctl for graphics switching. supergfxctl is the result of making \
+         asusctl graphics switching generic so all laptops can use it"
+    );
+    println!("This command will be removed in future");
+}
+
 fn handle_backlight(cmd: &BacklightCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if cmd.screenpad_brightness.is_none()
+    if (cmd.screenpad_brightness.is_none()
         && cmd.screenpad_gamma.is_none()
-        && cmd.sync_screenpad_brightness.is_none()
+        && cmd.sync_screenpad_brightness.is_none())
+        || cmd.help
     {
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+
         let backlights = find_iface::<BacklightProxyBlocking>("xyz.ljones.Backlight")?;
         for backlight in backlights {
             println!("Current screenpad settings:");
@@ -303,50 +433,8 @@ fn handle_backlight(cmd: &BacklightCommand) -> Result<(), Box<dyn std::error::Er
     Ok(())
 }
 
-fn handle_brightness(cmd: &BrightnessCommand) -> Result<(), Box<dyn std::error::Error>> {
-    let Ok(aura_proxies) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") else {
-        println!("No aura interface found");
-        return Ok(());
-    };
-
-    match &cmd.command {
-        BrightnessSubCommand::Set(s) => {
-            for aura in aura_proxies.iter() {
-                if let Some(level) = s.level.level() {
-                    aura.set_brightness(rog_aura::LedBrightness::from(level))?;
-                } else {
-                    let current = aura.brightness()?;
-                    println!("Current keyboard led brightness: {current:?}");
-                }
-            }
-        }
-        BrightnessSubCommand::Get(_) => {
-            for aura in aura_proxies.iter() {
-                let level = aura.brightness()?;
-                println!("Current keyboard led brightness: {level:?}");
-            }
-
-            return Ok(());
-        }
-        BrightnessSubCommand::Next(_) => {
-            for aura in aura_proxies.iter() {
-                let brightness = aura.brightness()?;
-                aura.set_brightness(brightness.next())?;
-            }
-        }
-        BrightnessSubCommand::Prev(_) => {
-            for aura in aura_proxies.iter() {
-                let brightness = aura.brightness()?;
-                aura.set_brightness(brightness.prev())?;
-            }
-        }
-    }
-
-    Ok(())
-}
-
 fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if cmd.command.is_none()
+    if (cmd.command.is_none()
         && cmd.enable_display.is_none()
         && cmd.enable_powersave_anim.is_none()
         && cmd.brightness.is_none()
@@ -354,9 +442,13 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
         && cmd.off_when_suspended.is_none()
         && cmd.off_when_unplugged.is_none()
         && cmd.off_with_his_head.is_none()
-        && !cmd.clear
+        && !cmd.clear)
+        || cmd.help
     {
-        println!("Missing arg or command; run 'asusctl anime --help' for usage");
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
     }
 
     let animes = find_iface::<AnimeProxyBlocking>("xyz.ljones.Anime").map_err(|e| {
@@ -403,10 +495,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
         if let Some(action) = cmd.command.as_ref() {
             match action {
                 AnimeActions::Image(image) => {
-                    if image.path.is_empty() {
-                        println!(
-                            "Missing arg or command; run 'asusctl anime image --help' for usage"
-                        );
+                    if image.help_requested() || image.path.is_empty() {
+                        println!("Missing arg or command\n\n{}", image.self_usage());
+                        if let Some(lst) = image.self_command_list() {
+                            println!("\n{}", lst);
+                        }
                         return Ok(());
                     }
                     verify_brightness(image.bright);
@@ -423,8 +516,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     proxy.write(<AnimeDataBuffer>::try_from(&matrix)?)?;
                 }
                 AnimeActions::PixelImage(image) => {
-                    if image.path.is_empty() {
-                        println!("Missing arg or command; run 'asusctl anime pixel-image --help' for usage");
+                    if image.help_requested() || image.path.is_empty() {
+                        println!("Missing arg or command\n\n{}", image.self_usage());
+                        if let Some(lst) = image.self_command_list() {
+                            println!("\n{}", lst);
+                        }
                         return Ok(());
                     }
                     verify_brightness(image.bright);
@@ -439,10 +535,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     proxy.write(matrix.into_data_buffer(anime_type)?)?;
                 }
                 AnimeActions::Gif(gif) => {
-                    if gif.path.is_empty() {
-                        println!(
-                            "Missing arg or command; run 'asusctl anime gif --help' for usage"
-                        );
+                    if gif.help_requested() || gif.path.is_empty() {
+                        println!("Missing arg or command\n\n{}", gif.self_usage());
+                        if let Some(lst) = gif.self_command_list() {
+                            println!("\n{}", lst);
+                        }
                         return Ok(());
                     }
                     verify_brightness(gif.bright);
@@ -472,8 +569,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     }
                 }
                 AnimeActions::PixelGif(gif) => {
-                    if gif.path.is_empty() {
-                        println!("Missing arg or command; run 'asusctl anime pixel-gif --help' for usage");
+                    if gif.help_requested() || gif.path.is_empty() {
+                        println!("Missing arg or command\n\n{}", gif.self_usage());
+                        if let Some(lst) = gif.self_command_list() {
+                            println!("\n{}", lst);
+                        }
                         return Ok(());
                     }
                     verify_brightness(gif.bright);
@@ -500,8 +600,14 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     }
                 }
                 AnimeActions::SetBuiltins(builtins) => {
-                    if builtins.set.is_none() {
-                        println!("Missing arg; run 'asusctl anime set-builtins --help' for usage");
+                    if builtins.help_requested() || builtins.set.is_none() {
+                        println!(
+                            "\nAny unspecified args will be set to default (first shown var)\n"
+                        );
+                        println!("\n{}", builtins.self_usage());
+                        if let Some(lst) = builtins.self_command_list() {
+                            println!("\n{}", lst);
+                        }
                         return Ok(());
                     }
 
@@ -528,19 +634,24 @@ fn verify_brightness(brightness: f32) {
 }
 
 fn handle_slash(cmd: &SlashCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if cmd.brightness.is_none()
+    if (cmd.brightness.is_none()
         && cmd.interval.is_none()
         && cmd.show_on_boot.is_none()
         && cmd.show_on_shutdown.is_none()
         && cmd.show_on_sleep.is_none()
         && cmd.show_on_battery.is_none()
         && cmd.show_battery_warning.is_none()
+        // && cmd.show_on_lid_closed.is_none()
         && cmd.mode.is_none()
         && !cmd.list
         && !cmd.enable
-        && !cmd.disable
+        && !cmd.disable)
+        || cmd.help
     {
-        println!("Missing arg or command; run 'asusctl slash --help' for usage");
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
     }
 
     let slashes = find_iface::<SlashProxyBlocking>("xyz.ljones.Slash")?;
@@ -591,8 +702,13 @@ fn handle_slash(cmd: &SlashCommand) -> Result<(), Box<dyn std::error::Error>> {
 }
 
 fn handle_scsi(cmd: &ScsiCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if !cmd.list && cmd.enable.is_none() && cmd.mode.is_none() && cmd.colours.is_empty() {
-        println!("Missing arg or command; run 'asusctl scsi --help' for usage");
+    if (!cmd.list && cmd.enable.is_none() && cmd.mode.is_none() && cmd.colours.is_empty())
+        || cmd.help
+    {
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
     }
 
     let scsis = find_iface::<ScsiAuraProxyBlocking>("xyz.ljones.ScsiAura")?;
@@ -658,15 +774,38 @@ fn handle_scsi(cmd: &ScsiCommand) -> Result<(), Box<dyn std::error::Error>> {
 
 fn handle_led_mode(mode: &LedModeCommand) -> Result<(), Box<dyn std::error::Error>> {
     if mode.command.is_none() && !mode.prev_mode && !mode.next_mode {
-        println!("Missing arg or command; run 'asusctl aura --help' for usage");
-        // print available modes when possible
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
+        if !mode.help {
+            println!("Missing arg or command\n");
+        }
+        println!("{}\n", mode.self_usage());
+        println!("Commands available");
+
+        if let Some(cmdlist) = LedModeCommand::command_list() {
+            let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
+            // TODO: multiple rgb check
+            let aura = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura")?;
             let modes = aura.first().unwrap().supported_basic_modes()?;
-            println!("Available modes:");
-            for m in modes {
-                println!("  {:?}", m);
+            for command in commands.iter().filter(|command| {
+                for mode in &modes {
+                    let mut mode = <&str>::from(mode).to_string();
+                    if let Some(pos) = mode.chars().skip(1).position(|c| c.is_uppercase()) {
+                        mode.insert(pos + 1, '-');
+                    }
+                    if command.trim().starts_with(&mode.to_lowercase()) {
+                        return true;
+                    }
+                }
+                // TODO
+                // if !supported.basic_zones.is_empty() && command.trim().starts_with("multi") {
+                //     return true;
+                // }
+                false
+            }) {
+                println!("{}", command);
             }
         }
+
+        println!("\nHelp can also be requested on modes, e.g: static --help");
         return Ok(());
     }
 
@@ -698,6 +837,10 @@ fn handle_led_mode(mode: &LedModeCommand) -> Result<(), Box<dyn std::error::Erro
             aura.set_led_mode(modes[pos])?;
         }
     } else if let Some(mode) = mode.command.as_ref() {
+        if mode.help_requested() {
+            println!("{}", mode.self_usage());
+            return Ok(());
+        }
         for aura in aura {
             aura.set_led_mode_data(<AuraEffect>::from(mode))?;
         }
@@ -720,7 +863,10 @@ fn handle_led_power1(power: &LedPowerCommand1) -> Result<(), Box<dyn std::error:
             && !power.keyboard
             && !power.lightbar
         {
-            println!("Missing arg or command; run 'asusctl aura-power-old --help' for usage");
+            if !power.help {
+                println!("Missing arg or command\n");
+            }
+            println!("{}\n", power.self_usage());
             return Ok(());
         }
 
@@ -772,47 +918,51 @@ fn handle_led_power2(power: &LedPowerCommand2) -> Result<(), Box<dyn std::error:
             continue;
         }
 
-        if power.command.is_none() {
-            println!("Missing arg or command; run 'asusctl aura-power --help' for usage");
+        if power.command().is_none() {
+            if !power.help {
+                println!("Missing arg or command\n");
+            }
+            println!("{}\n", power.self_usage());
             println!("Commands available");
+
+            if let Some(cmdlist) = LedPowerCommand2::command_list() {
+                let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
+                for command in &commands {
+                    println!("{}", command);
+                }
+            }
+
+            println!("\nHelp can also be requested on commands, e.g: boot --help");
             return Ok(());
         }
 
-        if let Some(_pow) = power.command.as_ref() {
+        if let Some(pow) = power.command.as_ref() {
+            if pow.help_requested() {
+                println!("{}", pow.self_usage());
+                return Ok(());
+            }
+
             let mut states = aura.led_power()?;
-            let mut set =
-                |zone: PowerZones, boot_v: bool, awake_v: bool, sleep_v: bool, shutdown_v: bool| {
-                    for state in states.states.iter_mut() {
-                        if state.zone == zone {
-                            state.boot = boot_v;
-                            state.awake = awake_v;
-                            state.sleep = sleep_v;
-                            state.shutdown = shutdown_v;
-                            break;
-                        }
+            let mut set = |zone: PowerZones, set_to: &AuraPowerStates| {
+                for state in states.states.iter_mut() {
+                    if state.zone == zone {
+                        state.boot = set_to.boot;
+                        state.awake = set_to.awake;
+                        state.sleep = set_to.sleep;
+                        state.shutdown = set_to.shutdown;
+                        break;
                     }
-                };
+                }
+            };
 
             if let Some(cmd) = &power.command {
                 match cmd {
-                    aura_cli::SetAuraZoneEnabled::Keyboard(k) => {
-                        set(PowerZones::Keyboard, k.boot, k.awake, k.sleep, k.shutdown)
-                    }
-                    aura_cli::SetAuraZoneEnabled::Logo(l) => {
-                        set(PowerZones::Logo, l.boot, l.awake, l.sleep, l.shutdown)
-                    }
-                    aura_cli::SetAuraZoneEnabled::Lightbar(l) => {
-                        set(PowerZones::Lightbar, l.boot, l.awake, l.sleep, l.shutdown)
-                    }
-                    aura_cli::SetAuraZoneEnabled::Lid(l) => {
-                        set(PowerZones::Lid, l.boot, l.awake, l.sleep, l.shutdown)
-                    }
-                    aura_cli::SetAuraZoneEnabled::RearGlow(r) => {
-                        set(PowerZones::RearGlow, r.boot, r.awake, r.sleep, r.shutdown)
-                    }
-                    aura_cli::SetAuraZoneEnabled::Ally(r) => {
-                        set(PowerZones::Ally, r.boot, r.awake, r.sleep, r.shutdown)
-                    }
+                    aura_cli::SetAuraZoneEnabled::Keyboard(k) => set(PowerZones::Keyboard, k),
+                    aura_cli::SetAuraZoneEnabled::Logo(l) => set(PowerZones::Logo, l),
+                    aura_cli::SetAuraZoneEnabled::Lightbar(l) => set(PowerZones::Lightbar, l),
+                    aura_cli::SetAuraZoneEnabled::Lid(l) => set(PowerZones::Lid, l),
+                    aura_cli::SetAuraZoneEnabled::RearGlow(r) => set(PowerZones::RearGlow, r),
+                    aura_cli::SetAuraZoneEnabled::Ally(r) => set(PowerZones::Ally, r),
                 }
             }
 
@@ -833,39 +983,53 @@ fn handle_throttle_profile(
         return Err(ProfileError::NotSupported.into());
     }
 
+    if !cmd.next
+        && !cmd.list
+        && cmd.profile_set.is_none()
+        && !cmd.profile_get
+        && cmd.profile_set_ac.is_none()
+        && cmd.profile_set_bat.is_none()
+    {
+        if !cmd.help {
+            println!("Missing arg or command\n");
+        }
+        println!("{}", ProfileCommand::usage());
+
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
+        return Ok(());
+    }
+
     let proxy = PlatformProxyBlocking::new(conn)?;
     let current = proxy.platform_profile()?;
     let choices = proxy.platform_profile_choices()?;
 
-    match &cmd.command {
-        crate::cli_opts::ProfileSubCommand::Next(_) => {
-            proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
-        }
-        crate::cli_opts::ProfileSubCommand::Set(s) => {
-            if !s.ac && !s.battery {
-                proxy.set_platform_profile(s.profile)?;
-            } else {
-                if s.ac {
-                    proxy.set_platform_profile_on_ac(s.profile)?;
-                }
-                if s.battery {
-                    proxy.set_platform_profile_on_battery(s.profile)?;
-                }
-            }
-        }
-        crate::cli_opts::ProfileSubCommand::List(_) => {
-            for p in &choices {
-                println!("{:?}", p);
-            }
-        }
-        crate::cli_opts::ProfileSubCommand::Get(_) => {
-            println!("Active profile: {current:?}");
-            println!();
-            println!("AC profile {:?}", proxy.platform_profile_on_ac()?);
-            println!("Battery profile {:?}", proxy.platform_profile_on_battery()?);
+    if cmd.next {
+        proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
+    } else if let Some(profile) = cmd.profile_set {
+        proxy.set_platform_profile(profile)?;
+    } else if let Some(profile) = cmd.profile_set_ac {
+        proxy.set_platform_profile_on_ac(profile)?;
+    } else if let Some(profile) = cmd.profile_set_bat {
+        proxy.set_platform_profile_on_battery(profile)?;
+    }
+
+    if cmd.list {
+        for p in &choices {
+            println!("{:?}", p);
         }
     }
 
+    if cmd.profile_get {
+        println!("Active profile is {current:?}");
+        println!("Profile on AC is {:?}", proxy.platform_profile_on_ac()?);
+        println!(
+            "Profile on Battery is {:?}",
+            proxy.platform_profile_on_battery()?
+        );
+    }
+
     Ok(())
 }
 
@@ -880,7 +1044,14 @@ fn handle_fan_curve(
     };
 
     if !cmd.get_enabled && !cmd.default && cmd.mod_profile.is_none() {
-        println!("Missing arg or command; run 'asusctl fan-curve --help' for usage");
+        if !cmd.help {
+            println!("Missing arg or command\n");
+        }
+        println!("{}", FanCurveCommand::usage());
+
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
         return Ok(());
     }
 
@@ -1019,33 +1190,33 @@ fn print_firmware_attr(attr: &AsusArmouryProxyBlocking) -> Result<(), Box<dyn st
 
 #[allow(clippy::manual_is_multiple_of, clippy::nonminimal_bool)]
 fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error::Error>> {
-    // If nested subcommand provided, handle set/get/list.
-    match &cmd.command {
-        ArmourySubCommand::List(_) => {
-            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-                for attr in attrs.iter() {
+    {
+        if cmd.free.is_empty() || (cmd.free.len() % 2 != 0) || cmd.help {
+            const USAGE: &str = "Usage: asusctl platform panel_overdrive 1 nv_dynamic_boost 5";
+            if cmd.free.len() % 2 != 0 {
+                println!(
+                    "Incorrect number of args, each attribute label must be paired with a setting:"
+                );
+                println!("{USAGE}");
+                return Ok(());
+            }
+
+            if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                println!("\n{USAGE}\n");
+                println!("Available firmware attributes: ");
+                for attr in attr.iter() {
                     print_firmware_attr(attr)?;
                 }
             }
-            Ok(())
+            return Ok(());
         }
-        ArmourySubCommand::Get(g) => {
-            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-                for attr in attrs.iter() {
+
+        if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+            for cmd in cmd.free.chunks(2) {
+                for attr in attr.iter() {
                     let name = attr.name()?;
-                    if <&str>::from(name) == g.property {
-                        print_firmware_attr(attr)?;
-                    }
-                }
-            }
-            Ok(())
-        }
-        ArmourySubCommand::Set(s) => {
-            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-                for attr in attrs.iter() {
-                    let name = attr.name()?;
-                    if <&str>::from(name) == s.property {
-                        let mut value: i32 = s.value;
+                    if <&str>::from(name) == cmd[0] {
+                        let mut value: i32 = cmd[1].parse()?;
                         if value == -1 {
                             info!("Setting to default");
                             value = attr.default_value()?;
@@ -1055,7 +1226,7 @@ fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error
                     }
                 }
             }
-            Ok(())
         }
     }
+    Ok(())
 }

asusctl/src/scsi_cli.rs

@@ -1,30 +1,35 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_scsi::{AuraMode, Colour, Direction, Speed};
 
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "scsi", description = "scsi LED commands")]
+#[derive(Options)]
 pub struct ScsiCommand {
-    #[argh(option, description = "enable the SCSI drive LEDs")]
+    #[options(help = "print help message")]
+    pub help: bool,
+
+    #[options(help = "Enable the SCSI drive LEDs")]
     pub enable: Option<bool>,
 
-    #[argh(option, description = "set LED mode (use 'list' for all options)")]
+    #[options(meta = "", help = "Set LED mode (so 'list' for all options)")]
     pub mode: Option<AuraMode>,
 
-    #[argh(
-        option,
-        description = "set LED mode speed <slowest, slow, med, fast, fastest>"
+    #[options(
+        meta = "",
+        help = "Set LED mode speed <slowest, slow, med, fast, fastest> (does not apply to all)"
     )]
     pub speed: Option<Speed>,
 
-    #[argh(option, description = "set LED mode direction <forward, reverse>")]
+    #[options(
+        meta = "",
+        help = "Set LED mode direction <forward, reverse> (does not apply to all)"
+    )]
     pub direction: Option<Direction>,
 
-    #[argh(
-        option,
-        description = "set LED colours <hex>, specify up to 4 with repeated arg"
+    #[options(
+        meta = "",
+        help = "Set LED colours <hex>, specify up to 4 with repeated arg"
     )]
     pub colours: Vec<Colour>,
 
-    #[argh(switch, description = "list available animations")]
+    #[options(help = "list available animations")]
     pub list: bool,
 }

asusctl/src/slash_cli.rs

@@ -1,34 +1,37 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_slash::SlashMode;
 
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "slash", description = "slash ledbar commands")]
+#[derive(Options)]
 pub struct SlashCommand {
-    #[argh(switch, description = "enable the Slash Ledbar")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(help = "Enable the Slash Ledbar")]
     pub enable: bool,
-    #[argh(switch, description = "disable the Slash Ledbar")]
+    #[options(help = "Disable the Slash Ledbar")]
     pub disable: bool,
-    #[argh(option, short = 'l', description = "set brightness value <0-255>")]
+    #[options(short = "l", meta = "", help = "Set brightness value <0-255>")]
     pub brightness: Option<u8>,
-    #[argh(option, description = "set interval value <0-5>")]
+    #[options(meta = "", help = "Set interval value <0-5>")]
     pub interval: Option<u8>,
-    #[argh(option, description = "set SlashMode (use 'list' for options)")]
+    #[options(meta = "", help = "Set SlashMode (so 'list' for all options)")]
     pub mode: Option<SlashMode>,
-    #[argh(switch, description = "list available animations")]
+    #[options(help = "list available animations")]
     pub list: bool,
 
-    #[argh(option, short = 'B', description = "show the animation on boot")]
+    #[options(short = "B", meta = "", help = "Show the animation on boot")]
     pub show_on_boot: Option<bool>,
-    #[argh(option, short = 'S', description = "show the animation on shutdown")]
+    #[options(short = "S", meta = "", help = "Show the animation on shutdown")]
     pub show_on_shutdown: Option<bool>,
-    #[argh(option, short = 's', description = "show the animation on sleep")]
+    #[options(short = "s", meta = "", help = "Show the animation on sleep")]
     pub show_on_sleep: Option<bool>,
-    #[argh(option, short = 'b', description = "show the animation on battery")]
+    #[options(short = "b", meta = "", help = "Show the animation on battery")]
     pub show_on_battery: Option<bool>,
-    #[argh(
-        option,
-        short = 'w',
-        description = "show the low-battery warning animation"
+    // #[options(short = "L", meta = "", help = "Show the animation on lid closed")]
+    // pub show_on_lid_closed: Option<bool>,
+    #[options(
+        short = "w",
+        meta = "",
+        help = "Show the low-battery warning animation"
     )]
     pub show_battery_warning: Option<bool>,
 }

asusd/src/asus_armoury.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use config_traits::StdConfig;
-use log::{debug, error, info, warn};
+use log::{debug, error, info};
 use rog_platform::asus_armoury::{AttrValue, Attribute, FirmwareAttribute, FirmwareAttributes};
 use rog_platform::platform::{PlatformProfile, RogPlatform};
 use rog_platform::power::AsusPower;
@@ -205,13 +205,7 @@ impl crate::Reloadable for AsusArmouryAttribute {
                         self.attr.base_path_exists();
                         e
                     })?;
-                info!(
-                    "Restored PPT armoury setting {} to {:?}",
-                    self.attr.name(),
-                    tune
-                );
-            } else {
-                info!("Ignored restoring PPT armoury setting {} as tuning group is disabled or no saved value", self.attr.name());
+                info!("Set {} to {:?}", self.attr.name(), tune);
             }
         } else {
             // Handle non-PPT attributes (boolean and other settings)
@@ -219,10 +213,7 @@ impl crate::Reloadable for AsusArmouryAttribute {
                 self.attr
                     .set_current_value(&AttrValue::Integer(*saved_value))
                     .map_err(|e| {
-                        error!(
-                            "Error restoring armoury setting {}: {e:?}",
-                            self.attr.name()
-                        );
+                        error!("Could not set {} value: {e:?}", self.attr.name());
                         self.attr.base_path_exists();
                         e
                     })?;
@@ -231,11 +222,6 @@ impl crate::Reloadable for AsusArmouryAttribute {
                     self.attr.name(),
                     saved_value
                 );
-            } else {
-                info!(
-                    "No saved armoury setting for {}: skipping restore",
-                    self.attr.name()
-                );
             }
         }
 
@@ -411,44 +397,44 @@ impl AsusArmouryAttribute {
                 self.attr
                     .set_current_value(&AttrValue::Integer(value))
                     .map_err(|e| {
-                        error!(
-                            "Could not set value to PPT property {}: {e:?}",
-                            self.attr.name()
-                        );
+                        error!("Could not set value: {e:?}");
                         e
                     })?;
-            } else {
-                warn!(
-                    "Tuning group is disabled: skipping setting value to PPT property {}",
-                    self.attr.name()
-                );
             }
         } else {
             self.attr
                 .set_current_value(&AttrValue::Integer(value))
                 .map_err(|e| {
-                    error!(
-                        "Could not set value {value} to attribute {}: {e:?}",
-                        self.attr.name()
-                    );
+                    error!("Could not set value: {e:?}");
                     e
                 })?;
 
-            let mut settings = self.config.lock().await;
-            settings
+            let has_attr = self
+                .config
+                .lock()
+                .await
                 .armoury_settings
-                .entry(self.name())
-                .and_modify(|setting| {
-                    debug!("Set config for {} = {value}", self.attr.name());
-                    *setting = value;
-                })
-                .or_insert_with(|| {
-                    debug!("Adding config for {} = {value}", self.attr.name());
-                    value
-                });
+                .contains_key(&self.name());
+            if has_attr {
+                if let Some(setting) = self
+                    .config
+                    .lock()
+                    .await
+                    .armoury_settings
+                    .get_mut(&self.name())
+                {
+                    *setting = value
+                }
+            } else {
+                debug!("Adding config for {}", self.attr.name());
+                self.config
+                    .lock()
+                    .await
+                    .armoury_settings
+                    .insert(self.name(), value);
+                debug!("Set config for {} = {:?}", self.attr.name(), value);
+            }
         }
-
-        // write config after setting value
         self.config.lock().await.write();
         Ok(())
     }

data/asusd.service

@@ -9,7 +9,7 @@ Environment=IS_SERVICE=1
 # Reduce noisy span logs while keeping useful debug info for asusd and related crates.
 # Keep global level at info but allow debug for our crates; silence tracing::span (very noisy)
 # RUST_LOG format: <module>=<level>,...  (levels: error,warn,info,debug,trace)
-Environment=RUST_LOG="info,asusd=debug,rog_platform=debug,tracing::span=error,zbus::object_server=error,zbus::connection::handshake::common=error,zbus::connection::handshake::client=error"
+Environment=RUST_LOG="info,asusd=debug,rog_platform=debug,tracing::span=error"
 # required to prevent init issues with hid_asus and MCU
 ExecStartPre=/bin/sleep 1
 ExecStart=/usr/bin/asusd

rog-aura/src/builtin_modes.rs

@@ -359,12 +359,6 @@ impl From<AuraEffect> for AuraModeNum {
     }
 }
 
-#[cfg(feature = "dbus")]
-impl zbus::zvariant::Basic for AuraModeNum {
-    const SIGNATURE_CHAR: char = 'u';
-    const SIGNATURE_STR: &'static str = "u";
-}
-
 /// Base effects have no zoning, while multizone is 1-4
 #[cfg_attr(
     feature = "dbus",

rog-control-center/src/tray.rs

@@ -170,7 +170,7 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
 
         // TODO: return an error to the UI
         let mut tray;
-        match tray_init.disable_dbus_name(true).spawn().await {
+        match tray_init.spawn_without_dbus_name().await {
             Ok(t) => tray = t,
             Err(e) => {
                 log::error!(

rog-control-center/ui/pages/about.slint

@@ -17,7 +17,7 @@ export component PageAbout inherits VerticalLayout {
 
             Text {
                 wrap: TextWrap.word-wrap;
-                text: "You need to use kernel version 6.19 to use this software";
+                text: "You will require a kernel built with my work from here: https://github.com/flukejones/linux";
             }
 
             Text {
@@ -43,6 +43,10 @@ export component PageAbout inherits VerticalLayout {
                 text: "- [ ] Slash control";
             }
 
+            Text {
+                text: "- [ ] Supergfx control";
+            }
+
             Text {
                 text: "- [ ] Screenpad controls";
             }

rog-scsi/src/builtin_modes.rs

@@ -177,12 +177,6 @@ pub enum AuraMode {
     DoubleFade = 14,
 }
 
-#[cfg(feature = "dbus")]
-impl zbus::zvariant::Basic for AuraMode {
-    const SIGNATURE_CHAR: char = 'u';
-    const SIGNATURE_STR: &'static str = "u";
-}
-
 impl AuraMode {
     pub fn list() -> [String; 15] {
         [

rog-slash/src/data.rs

@@ -12,13 +12,12 @@ use crate::usb::{PROD_ID1, PROD_ID1_STR, PROD_ID2, PROD_ID2_STR};
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum SlashType {
-    GA403_2024,
-    GA403_2025,
-    GA605_2024,
-    GA605_2025,
-    GU605_2024,
-    GU605_2025,
-    G614_2025,
+    GA403,
+    GA403W,
+    GA605,
+    GU605,
+    GU605C,
+    G614F,
     #[default]
     Unsupported,
 }
@@ -26,26 +25,24 @@ pub enum SlashType {
 impl SlashType {
     pub const fn prod_id(&self) -> u16 {
         match self {
-            SlashType::GA403_2025 => PROD_ID2,
-            SlashType::GA403_2024 => PROD_ID1,
-            SlashType::GA605_2025 => PROD_ID2,
-            SlashType::GA605_2024 => PROD_ID2,
-            SlashType::GU605_2025 => PROD_ID2,
-            SlashType::GU605_2024 => PROD_ID1,
-            SlashType::G614_2025 => PROD_ID2,
+            SlashType::GA403W => PROD_ID2,
+            SlashType::GA403 => PROD_ID1,
+            SlashType::GA605 => PROD_ID2,
+            SlashType::GU605 => PROD_ID1,
+            SlashType::GU605C => PROD_ID2,
+            SlashType::G614F => PROD_ID2,
             SlashType::Unsupported => 0,
         }
     }
 
     pub const fn prod_id_str(&self) -> &str {
         match self {
-            SlashType::GA403_2025 => PROD_ID2_STR,
-            SlashType::GA403_2024 => PROD_ID1_STR,
-            SlashType::GA605_2025 => PROD_ID2_STR,
-            SlashType::GA605_2024 => PROD_ID2_STR,
-            SlashType::GU605_2025 => PROD_ID2_STR,
-            SlashType::GU605_2024 => PROD_ID1_STR,
-            SlashType::G614_2025 => PROD_ID2_STR,
+            SlashType::GA403W => PROD_ID2_STR,
+            SlashType::GA403 => PROD_ID1_STR,
+            SlashType::GA605 => PROD_ID2_STR,
+            SlashType::GU605 => PROD_ID1_STR,
+            SlashType::GU605C => PROD_ID2_STR,
+            SlashType::G614F => PROD_ID2_STR,
             SlashType::Unsupported => "",
         }
     }
@@ -53,24 +50,17 @@ impl SlashType {
     pub fn from_dmi() -> Self {
         let board_name = DMIID::new().unwrap_or_default().board_name.to_uppercase();
         if board_name.contains("G614F") {
-            SlashType::G614_2025
-        } else if [
-            "GA403W", "GA403UH", "GA403UM", "GA403UP",
-        ]
-        .iter()
-        .any(|s| board_name.contains(s))
-        {
-            SlashType::GA403_2025
+            SlashType::G614F
+        } else if board_name.contains("GA403W") {
+            SlashType::GA403W
         } else if board_name.contains("GA403") {
-            SlashType::GA403_2024
-        } else if board_name.contains("GA605K") {
-            SlashType::GA605_2025
+            SlashType::GA403
         } else if board_name.contains("GA605") {
-            SlashType::GA605_2024
+            SlashType::GA605
         } else if board_name.contains("GU605C") {
-            SlashType::GU605_2025
+            SlashType::GU605C
         } else if board_name.contains("GU605") {
-            SlashType::GU605_2024
+            SlashType::GU605
         } else {
             SlashType::Unsupported
         }
@@ -82,13 +72,12 @@ impl FromStr for SlashType {
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
         Ok(match s.to_uppercase().as_str() {
-            "GA403_2025" => Self::GA403_2025,
-            "GA403_2024" => Self::GA403_2024,
-            "GA605_2025" => Self::GA605_2025,
-            "GA605_2024" => Self::GA605_2024,
-            "GU605_2025" => Self::GU605_2025,
-            "GU605_2024" => Self::GU605_2024,
-            "G614_2025" => Self::G614_2025,
+            "GA403W" => Self::GA403W,
+            "GA403" => Self::GA403,
+            "GA605" => Self::GA605,
+            "GU605C" => Self::GU605C,
+            "GU605" => Self::GU605,
+            "G614FR" => Self::G614F,
             _ => Self::Unsupported,
         })
     }

rog-slash/src/usb.rs

@@ -39,24 +39,17 @@ pub fn get_slash_type() -> SlashType {
         .unwrap_or_default();
     let board_name = dmi.board_name.to_uppercase();
     if board_name.contains("G614F") {
-        SlashType::G614_2025
-    } else if [
-        "GA403W", "GA403UH", "GA403UM", "GA403UP",
-    ]
-    .iter()
-    .any(|s| board_name.contains(s))
-    {
-        SlashType::GA403_2025
+        SlashType::G614F
+    } else if board_name.contains("GA403W") {
+        SlashType::GA403W
     } else if board_name.contains("GA403") {
-        SlashType::GA403_2024
-    } else if board_name.contains("GA605K") {
-        SlashType::GA605_2025
+        SlashType::GA403
     } else if board_name.contains("GA605") {
-        SlashType::GA605_2024
+        SlashType::GA605
     } else if board_name.contains("GU605C") {
-        SlashType::GU605_2025
+        SlashType::GU605C
     } else if board_name.contains("GU605") {
-        SlashType::GU605_2024
+        SlashType::GU605
     } else {
         SlashType::Unsupported
     }
@@ -64,13 +57,12 @@ pub fn get_slash_type() -> SlashType {
 
 pub const fn report_id(slash_type: SlashType) -> u8 {
     match slash_type {
-        SlashType::GA403_2025 => REPORT_ID_19B6,
-        SlashType::GA403_2024 => REPORT_ID_193B,
-        SlashType::GA605_2025 => REPORT_ID_19B6,
-        SlashType::GA605_2024 => REPORT_ID_19B6,
-        SlashType::GU605_2025 => REPORT_ID_19B6,
-        SlashType::GU605_2024 => REPORT_ID_193B,
-        SlashType::G614_2025 => REPORT_ID_19B6,
+        SlashType::GA403W => REPORT_ID_19B6,
+        SlashType::GA403 => REPORT_ID_193B,
+        SlashType::GA605 => REPORT_ID_19B6,
+        SlashType::G614F => REPORT_ID_19B6,
+        SlashType::GU605 => REPORT_ID_193B,
+        SlashType::GU605C => REPORT_ID_19B6,
         SlashType::Unsupported => REPORT_ID_19B6,
     }
 }