Update config & dbus parts, cleanup deps, device power states

- Add extra config options and dbus methods
- Add power state signals for anime and led
- Refactor to use channels for dbus signal handler send/recv
- Split out profiles independant parts to a rog-profiles crate
- Cleanup dependencies
- Fix some dbus Supported issues

asusctl/Cargo.toml

@@ -7,13 +7,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# serialisation
-serde_json = "^1.0"
 rog_anime = { path = "../rog-anime" }
 rog_aura = { path = "../rog-aura" }
 rog_dbus = { path = "../rog-dbus" }
+rog_profiles = { path = "../rog-profiles" }
 rog_types = { path = "../rog-types" }
-daemon = { path = "../daemon" }
+rog_fan_curve = { version = "^0.1", features = ["serde"] }
 gumdrop = "^0.8"
 yansi-term = "^0.1"
 

asusctl/examples/anime-diag-png.rs

@@ -1,10 +1,10 @@
 use std::{env, error::Error, path::Path, process::exit};
 
 use rog_anime::{AnimeDataBuffer, AnimeDiagonal};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
 
     let args: Vec<String> = env::args().into_iter().collect();
     if args.len() != 3 {

asusctl/examples/anime-diag.rs

@@ -1,7 +1,7 @@
 use std::{thread::sleep, time::Duration};
 
 use rog_anime::{AnimeDataBuffer, AnimeDiagonal};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 // In usable data:
 // Top row start at 1, ends at 32
@@ -9,7 +9,7 @@ use rog_dbus::AuraDbusClient;
 // 74w x 36h diagonal used by the windows app
 
 fn main() {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
 
     for step in (2..50).rev() {
         let mut matrix = AnimeDiagonal::new(None);

asusctl/examples/anime-gif.rs

@@ -1,10 +1,10 @@
 use std::{env, path::Path, thread::sleep};
 
 use rog_anime::{ActionData, AnimeAction, Sequences};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
 
     let args: Vec<String> = env::args().into_iter().collect();
     if args.len() != 3 {

asusctl/examples/anime-grid.rs

@@ -1,5 +1,5 @@
 use rog_anime::{AnimeDataBuffer, AnimeGrid};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 // In usable data:
 // Top row start at 1, ends at 32
@@ -7,7 +7,7 @@ use rog_dbus::AuraDbusClient;
 // 74w x 36h diagonal used by the windows app
 
 fn main() {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
     let mut matrix = AnimeGrid::new(None);
     let tmp = matrix.get_mut();
 

asusctl/examples/anime-outline.rs

@@ -1,11 +1,11 @@
 use rog_anime::AnimeDataBuffer;
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 // In usable data:
 // Top row start at 1, ends at 32
 
 fn main() {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
     let mut matrix = AnimeDataBuffer::new();
     matrix.get_mut()[1] = 100; // start = 1
     for n in matrix.get_mut()[2..32].iter_mut() {

asusctl/examples/anime-png.rs

@@ -3,10 +3,10 @@ use std::{env, error::Error, path::Path, process::exit};
 use rog_anime::{
     AnimeDataBuffer, {AnimeImage, Vec2},
 };
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
 
     let args: Vec<String> = env::args().into_iter().collect();
     if args.len() != 7 {

asusctl/examples/anime-spinning.rs

@@ -5,10 +5,10 @@ use std::{
 use rog_anime::{
     AnimeDataBuffer, {AnimeImage, Vec2},
 };
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let (client, _) = AuraDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new().unwrap();
 
     let args: Vec<String> = env::args().into_iter().collect();
     if args.len() != 7 {

asusctl/examples/aura-rgb-ball.rs

@@ -1,5 +1,5 @@
 use rog_aura::{GX502Layout, Key, KeyColourArray, KeyLayout};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 use std::collections::LinkedList;
 
 #[derive(Debug, Clone)]
@@ -52,7 +52,7 @@ impl Ball {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let (dbus, _) = AuraDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()?;
 
     let mut colours = KeyColourArray::new();
 

asusctl/examples/aura-rgb-comet.rs

@@ -1,8 +1,8 @@
 use rog_aura::{GX502Layout, KeyColourArray, KeyLayout};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let (dbus, _) = AuraDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()?;
 
     let layout = GX502Layout::default();
 

asusctl/examples/aura-rgb-iterate-keys.rs

@@ -1,8 +1,8 @@
 use rog_aura::{GX502Layout, Key, KeyColourArray, KeyLayout};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let (dbus, _) = AuraDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()?;
 
     let mut key_colours = KeyColourArray::new();
     let layout = GX502Layout::default();

asusctl/examples/aura-rgb-per-key-effect-2.rs

@@ -1,8 +1,8 @@
 use rog_aura::{Key, KeyColourArray};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let (dbus, _) = AuraDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()?;
 
     let mut key_colours = KeyColourArray::new();
 

asusctl/examples/aura-rgb-pulser.rs

@@ -1,8 +1,8 @@
 use rog_aura::{GX502Layout, KeyColourArray, KeyLayout};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let (dbus, _) = AuraDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()?;
 
     let mut key_colours = KeyColourArray::new();
     let layout = GX502Layout::default();

asusctl/src/main.rs

@@ -1,15 +1,17 @@
 mod anime_cli;
 mod aura_cli;
+mod profiles_cli;
 
 use crate::aura_cli::{LedBrightness, SetAuraBuiltin};
 use anime_cli::{AnimeActions, AnimeCommand};
 use gumdrop::{Opt, Options};
+use profiles_cli::ProfileCommand;
 use rog_anime::{AnimeDataBuffer, AnimeImage, Vec2, ANIME_DATA_LEN};
 use rog_aura::{self, AuraEffect};
-use rog_dbus::AuraDbusClient;
+use rog_dbus::RogDbusClient;
+use rog_profiles::profiles::Profile;
 use rog_types::{
     gfx_vendors::GfxVendors,
-    profile::{FanLevel, ProfileCommand, ProfileEvent},
     supported::{
         FanCpuSupportedFunctions, LedSupportedFunctions, RogBiosSupportedFunctions,
         SupportedFunctions,
@@ -29,11 +31,6 @@ struct CliStart {
     show_supported: bool,
     #[options(meta = "", help = "<off, low, med, high>")]
     kbd_bright: Option<LedBrightness>,
-    #[options(
-        meta = "",
-        help = "<silent, normal, boost>, set fan mode independent of profile"
-    )]
-    fan_mode: Option<FanLevel>,
     #[options(meta = "", help = "<20-100>")]
     chg_limit: Option<u8>,
     #[options(command)]
@@ -132,10 +129,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     }
 
-    let (dbus, _) = AuraDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()?;
 
-    let supported_tmp = dbus.proxies().supported().get_supported_functions()?;
-    let supported = serde_json::from_str::<SupportedFunctions>(&supported_tmp)?;
+    let supported = dbus.proxies().supported().get_supported_functions()?;
 
     if parsed.help {
         print_supported_help(&supported, &parsed);
@@ -147,7 +143,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         println!("  asusctl v{}", env!("CARGO_PKG_VERSION"));
         println!(" rog-dbus v{}", rog_dbus::VERSION);
         println!("rog-types v{}", rog_types::VERSION);
-        println!("   daemon v{}", daemon::VERSION);
         return Ok(());
     }
 
@@ -203,10 +198,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
         Some(CliCommand::Bios(cmd)) => handle_bios_option(&dbus, &supported.rog_bios_ctrl, &cmd)?,
         None => {
-            if (!parsed.show_supported
-                && parsed.kbd_bright.is_none()
-                && parsed.fan_mode.is_none()
-                && parsed.chg_limit.is_none())
+            if (!parsed.show_supported && parsed.kbd_bright.is_none() && parsed.chg_limit.is_none())
                 || parsed.help
             {
                 println!("{}", CliStart::usage());
@@ -231,15 +223,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     if parsed.show_supported {
         let dat = dbus.proxies().supported().get_supported_functions()?;
-        println!("Supported laptop functions:\n{}", dat);
+        println!("Supported laptop functions:\n{:?}", dat);
     }
 
-    if let Some(fan_level) = parsed.fan_mode {
-        dbus.proxies().profile().write_fan_mode(fan_level.into())?;
-    }
     if let Some(chg_limit) = parsed.chg_limit {
         dbus.proxies().charge().write_limit(chg_limit)?;
     }
+
     Ok(())
 }
 
@@ -269,7 +259,7 @@ fn print_supported_help(supported: &SupportedFunctions, parsed: &CliStart) {
         {
             return false;
         }
-        if line.contains("led-mode") && supported.keyboard_led.stock_led_modes.is_none() {
+        if line.contains("led-mode") && !supported.keyboard_led.stock_led_modes.is_empty() {
             return false;
         }
         if line.contains("bios")
@@ -295,7 +285,7 @@ fn print_supported_help(supported: &SupportedFunctions, parsed: &CliStart) {
 }
 
 fn do_gfx(
-    dbus: &AuraDbusClient,
+    dbus: &RogDbusClient,
     supported: &RogBiosSupportedFunctions,
     command: GraphicsCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
@@ -341,7 +331,7 @@ fn do_gfx(
 }
 
 fn handle_led_mode(
-    dbus: &AuraDbusClient,
+    dbus: &RogDbusClient,
     supported: &LedSupportedFunctions,
     mode: &LedModeCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
@@ -363,11 +353,9 @@ fn handle_led_mode(
             .map(|s| s.to_string())
             .collect();
         for command in commands.iter().filter(|command| {
-            if let Some(modes) = supported.stock_led_modes.as_ref() {
-                for mode in modes {
-                    if command.contains(&(<&str>::from(mode)).to_lowercase()) {
-                        return true;
-                    }
+            for mode in &supported.stock_led_modes {
+                if command.contains(<&str>::from(mode)) {
+                    return true;
                 }
             }
             if supported.multizone_led_mode {
@@ -421,7 +409,7 @@ fn handle_led_mode(
 }
 
 fn handle_profile(
-    dbus: &AuraDbusClient,
+    dbus: &RogDbusClient,
     supported: &FanCpuSupportedFunctions,
     cmd: &ProfileCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
@@ -476,14 +464,12 @@ fn handle_profile(
     if cmd.active_name {
         println!(
             "Active profile: {:?}",
-            dbus.proxies().profile().active_profile_name()?
+            dbus.proxies().profile().active_name()?
         );
     }
     if cmd.active_data {
         println!("Active profile:");
-        for s in dbus.proxies().profile().active_profile_data()?.lines() {
-            println!("{}", s);
-        }
+        println!("{:?}", dbus.proxies().profile().active_data()?);
     }
     if cmd.profiles_data {
         println!("Profiles:");
@@ -492,41 +478,48 @@ fn handle_profile(
         }
     }
 
-    // This must come before the next block of actions so that changing a specific
-    // profile can be done
-    if cmd.profile.is_some() {
-        dbus.proxies()
-            .profile()
-            .write_command(&ProfileEvent::Cli(cmd.clone()))?;
-        return Ok(());
+    let mut set_profile = false;
+    let mut profile;
+    if cmd.create {
+        profile = Profile::default();
+        set_profile = true;
+    } else {
+        profile = dbus.proxies().profile().active_data()?;
     }
 
     if let Some(turbo) = cmd.turbo {
-        dbus.proxies().profile().set_turbo(turbo)?;
+        set_profile = true;
+        profile.turbo = turbo;
     }
-
     if let Some(min) = cmd.min_percentage {
-        dbus.proxies().profile().set_min_frequency(min)?;
+        set_profile = true;
+        profile.min_percentage = min;
     }
-
     if let Some(max) = cmd.max_percentage {
-        dbus.proxies().profile().set_max_frequency(max)?;
+        set_profile = true;
+        profile.max_percentage = max;
     }
-
-    if let Some(ref preset) = cmd.fan_preset {
-        dbus.proxies().profile().set_fan_preset(preset.into())?;
+    if let Some(preset) = cmd.fan_preset {
+        set_profile = true;
+        profile.fan_preset = preset;
     }
-
     if let Some(ref curve) = cmd.curve {
-        let s = curve.as_config_string();
-        dbus.proxies().profile().set_fan_curve(&s)?;
+        set_profile = true;
+        profile.fan_curve = curve.as_config_string();
+    }
+    if let Some(ref name) = cmd.profile {
+        set_profile = true;
+        profile.name = name.clone();
+    }
+    if set_profile {
+        dbus.proxies().profile().new_or_modify(&profile)?;
     }
 
     Ok(())
 }
 
 fn handle_bios_option(
-    dbus: &AuraDbusClient,
+    dbus: &RogDbusClient,
     supported: &RogBiosSupportedFunctions,
     cmd: &BiosCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
@@ -545,8 +538,8 @@ fn handle_bios_option(
                 .collect();
 
             for line in usage.iter().filter(|line| {
-                !(line.contains("sound") && !supported.post_sound_toggle)
-                    || !(line.contains("GPU") && !supported.dedicated_gfx_toggle)
+                !line.contains("sound") && !supported.post_sound_toggle
+                    || !line.contains("GPU") && !supported.dedicated_gfx_toggle
             }) {
                 println!("{}", line);
             }

asusctl/src/profiles_cli.rs

@@ -0,0 +1,53 @@
+use gumdrop::Options;
+use rog_fan_curve::{Curve, Fan};
+use rog_profiles::profiles::FanLevel;
+
+#[derive(Debug, Clone, Options)]
+pub struct ProfileCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(help = "toggle to next profile in list")]
+    pub next: bool,
+    #[options(help = "create the profile if it doesn't exist")]
+    pub create: bool,
+    #[options(meta = "", help = "remove a profile by name")]
+    pub remove: Option<String>,
+    #[options(help = "list available profiles")]
+    pub list: bool,
+    #[options(help = "get active profile name")]
+    pub active_name: bool,
+    #[options(help = "get active profile data")]
+    pub active_data: bool,
+    #[options(help = "get all profile data")]
+    pub profiles_data: bool,
+
+    // Options for profile
+    #[options(meta = "", help = "enable or disable cpu turbo")]
+    pub turbo: Option<bool>,
+    #[options(meta = "", help = "set min cpu scaling (intel)")]
+    pub min_percentage: Option<u8>,
+    #[options(meta = "", help = "set max cpu scaling (intel)")]
+    pub max_percentage: Option<u8>,
+
+    #[options(meta = "", help = "<silent, normal, boost>")]
+    pub fan_preset: Option<FanLevel>,
+    #[options(
+        meta = "",
+        parse(try_from_str = "parse_fan_curve"),
+        help = "set fan curve"
+    )]
+    pub curve: Option<Curve>,
+    #[options(free)]
+    pub profile: Option<String>,
+}
+
+fn parse_fan_curve(data: &str) -> Result<Curve, String> {
+    let curve = Curve::from_config_str(data)?;
+    if let Err(err) = curve.check_safety(Fan::Cpu) {
+        return Err(format!("Unsafe curve {:?}", err));
+    }
+    if let Err(err) = curve.check_safety(Fan::Gpu) {
+        return Err(format!("Unsafe curve {:?}", err));
+    }
+    Ok(curve)
+}