anime: add zbus methods

daemon/src/ctrl_anime.rs

@@ -15,6 +15,7 @@ const ON_OFF: u8 = 0x04;
 
 use log::{error, info, warn};
 use rog_anime::{AniMeDataBuffer, AniMePacketType};
+use rog_types::supported::AnimeSupportedFunctions;
 use rusb::{Device, DeviceHandle};
 use std::error::Error;
 use std::time::Duration;
@@ -23,10 +24,6 @@ use zvariant::ObjectPath;
 
 use crate::GetSupported;
 
-use serde_derive::{Deserialize, Serialize};
-#[derive(Serialize, Deserialize)]
-pub struct AnimeSupportedFunctions(pub bool);
-
 impl GetSupported for CtrlAnimeDisplay {
     type A = AnimeSupportedFunctions;
 

daemon/src/ctrl_charge.rs

@@ -1,7 +1,7 @@
 use crate::{config::Config, error::RogError, GetSupported};
 //use crate::dbus::DbusEvents;
 use log::{info, warn};
-use serde_derive::{Deserialize, Serialize};
+use rog_types::supported::ChargeSupportedFunctions;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
@@ -12,11 +12,6 @@ use zvariant::ObjectPath;
 
 static BAT_CHARGE_PATH: &str = "/sys/class/power_supply/BAT0/charge_control_end_threshold";
 
-#[derive(Serialize, Deserialize)]
-pub struct ChargeSupportedFunctions {
-    pub charge_level_set: bool,
-}
-
 impl GetSupported for CtrlCharge {
     type A = ChargeSupportedFunctions;
 

daemon/src/ctrl_fan_cpu.rs

@@ -1,8 +1,7 @@
 use crate::error::RogError;
 use crate::{config::Config, GetSupported};
 use log::{info, warn};
-use rog_types::profile::{FanLevel, Profile, ProfileEvent};
-use serde_derive::{Deserialize, Serialize};
+use rog_types::{profile::{FanLevel, Profile, ProfileEvent}, supported::FanCpuSupportedFunctions};
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
@@ -20,13 +19,6 @@ pub struct CtrlFanAndCpu {
     config: Arc<Mutex<Config>>,
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct FanCpuSupportedFunctions {
-    pub stock_fan_modes: bool,
-    pub min_max_freq: bool,
-    pub fan_curve_set: bool,
-}
-
 impl GetSupported for CtrlFanAndCpu {
     type A = FanCpuSupportedFunctions;
 

daemon/src/ctrl_leds.rs

@@ -10,10 +10,7 @@ use crate::{
     laptops::{LaptopLedData, ASUS_KEYBOARD_DEVICES},
 };
 use log::{error, info, warn};
-use rog_types::{
-    aura_modes::{AuraEffect, AuraModeNum, LedBrightness},
-    LED_MSG_LEN,
-};
+use rog_types::{LED_MSG_LEN, aura_modes::{AuraEffect, AuraModeNum, LedBrightness}, supported::LedSupportedFunctions};
 use std::fs::OpenOptions;
 use std::io::{Read, Write};
 use std::path::Path;
@@ -24,15 +21,6 @@ use zvariant::ObjectPath;
 
 use crate::GetSupported;
 
-use serde_derive::{Deserialize, Serialize};
-#[derive(Serialize, Deserialize)]
-pub struct LedSupportedFunctions {
-    pub brightness_set: bool,
-    pub stock_led_modes: Option<Vec<AuraModeNum>>,
-    pub multizone_led_mode: bool,
-    pub per_key_led_mode: bool,
-}
-
 impl GetSupported for CtrlKbdBacklight {
     type A = LedSupportedFunctions;
 

daemon/src/ctrl_rog_bios.rs

@@ -1,6 +1,6 @@
 use crate::{config::Config, error::RogError, GetSupported};
 use log::{error, info, warn};
-use serde_derive::{Deserialize, Serialize};
+use rog_types::supported::RogBiosSupportedFunctions;
 use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::{Read, Write};
@@ -23,12 +23,6 @@ pub struct CtrlRogBios {
     _config: Arc<Mutex<Config>>,
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct RogBiosSupportedFunctions {
-    pub post_sound_toggle: bool,
-    pub dedicated_gfx_toggle: bool,
-}
-
 impl GetSupported for CtrlRogBios {
     type A = RogBiosSupportedFunctions;
 

daemon/src/ctrl_supported.rs

@@ -4,12 +4,13 @@ use zbus::dbus_interface;
 use zvariant::ObjectPath;
 
 use crate::{
-    ctrl_anime::{AnimeSupportedFunctions, CtrlAnimeDisplay},
-    ctrl_charge::{ChargeSupportedFunctions, CtrlCharge},
-    ctrl_fan_cpu::{CtrlFanAndCpu, FanCpuSupportedFunctions},
-    ctrl_leds::{CtrlKbdBacklight, LedSupportedFunctions},
-    ctrl_rog_bios::{CtrlRogBios, RogBiosSupportedFunctions},
-    GetSupported,
+    ctrl_anime::CtrlAnimeDisplay, ctrl_charge::CtrlCharge, ctrl_fan_cpu::CtrlFanAndCpu,
+    ctrl_leds::CtrlKbdBacklight, ctrl_rog_bios::CtrlRogBios, GetSupported,
+};
+
+use rog_types::supported::{
+    AnimeSupportedFunctions, ChargeSupportedFunctions, FanCpuSupportedFunctions,
+    LedSupportedFunctions, RogBiosSupportedFunctions,
 };
 
 #[derive(Serialize, Deserialize)]