Bump version

asus-nb-ctrl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "asus-nb-ctrl"
-version = "2.0.4"
+version = "2.0.5"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -22,7 +22,7 @@ name = "asusd"
 path = "src/daemon.rs"
 
 [dependencies]
-ctrl-gfx = { path = "../ctrl-gfx" } 
+ctrl-gfx = { path = "../ctrl-gfx" }
 asus-nb = { path = "../asus-nb" }
 rusb = "^0.6.0"
 udev = "^0.4.0"
@@ -33,7 +33,7 @@ log = "^0.4.8"
 env_logger = "^0.7.1"
 
 # async
-zbus = "1.1.1"
+zbus = "1.2.0"
 zvariant = "2.2.0"
 #tokio = { version = "^0.2.4", features = ["rt-threaded", "sync"] }
 
@@ -49,4 +49,4 @@ rog_fan_curve = { version = "0.1.5", features = ["serde"] }
 # cpu power management
 intel-pstate = "^0.2.1"
 
-yansi-term = "^0.1"
+yansi-term = "^0.1"

asus-nb-ctrl/src/ctrl_charge.rs

@@ -16,15 +16,9 @@ pub struct CtrlCharge {
     config: Arc<Mutex<Config>>,
 }
 
-trait Dbus {
-    fn set_limit(&mut self, charge: u8);
-    fn limit(&self) -> i8;
-    fn notify_charge(&self, limit: u8) -> zbus::Result<()>;
-}
-
 #[dbus_interface(name = "org.asuslinux.Daemon")]
-impl Dbus for CtrlCharge {
-    fn set_limit(&mut self, limit: u8) {
+impl CtrlCharge {
+    pub fn set_limit(&mut self, limit: u8) {
         if let Ok(mut config) = self.config.try_lock() {
             self.set(limit, &mut config)
                 .map_err(|err| {
@@ -41,7 +35,7 @@ impl Dbus for CtrlCharge {
         }
     }
 
-    fn limit(&self) -> i8 {
+    pub fn limit(&self) -> i8 {
         if let Ok(config) = self.config.try_lock() {
             return config.bat_charge_limit as i8;
         }
@@ -49,7 +43,7 @@ impl Dbus for CtrlCharge {
     }
 
     #[dbus_interface(signal)]
-    fn notify_charge(&self, limit: u8) -> zbus::Result<()>;
+    pub fn notify_charge(&self, limit: u8) -> zbus::Result<()>;
 }
 
 impl crate::ZbusAdd for CtrlCharge {

asus-nb-ctrl/src/daemon.rs

@@ -17,6 +17,8 @@ use std::sync::Mutex;
 
 use zbus::fdo;
 use zbus::Connection;
+use std::convert::Into;
+use std::convert::TryInto;
 
 pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut logger = env_logger::Builder::new();
@@ -134,6 +136,11 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
             }
         });
 
+    object_server.with(&"/org/asuslinux/Charge".try_into()?, |obj: &CtrlCharge| {
+        let x = obj.limit();
+        obj.notify_charge(x as u8)
+    })?;
+    
     loop {
         if let Err(err) = object_server.try_handle_next() {
             eprintln!("{}", err);