gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: update an old log comment. Don't reload panel_od if not available

Browse Source 
Closes #242
This commit is contained in:
Luke D. Jones
2022-08-21 21:28:52 +12:00
parent a32527d1df
commit eba9dc8a52
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
daemon/src/ctrl_platform.rs
View File

@@ -245,12 +245,14 @@ impl crate::ZbusAdd for CtrlRogBios {
impl crate::Reloadable for CtrlRogBios { impl crate::Reloadable for CtrlRogBios {
fn reload(&mut self) -> Result<(), RogError> { fn reload(&mut self) -> Result<(), RogError> {
let p = if let Ok(lock) = self.config.try_lock() { if self.platform.has_panel_od() {
lock.panel_od let p = if let Ok(lock) = self.config.try_lock() {
} else { lock.panel_od
false } else {
}; false
self.set_panel_od(p)?; };
self.set_panel_od(p)?;
}
Ok(()) Ok(())
} }
} }
@@ -266,26 +268,30 @@ impl CtrlTask for CtrlRogBios {
move || { move || {
info!("CtrlRogBios reloading panel_od"); info!("CtrlRogBios reloading panel_od");
if let Ok(lock) = platform1.config.try_lock() { if let Ok(lock) = platform1.config.try_lock() {
platform1 if platform1.platform.has_panel_od() {
.set_panel_od(lock.panel_od) platform1
.map_err(|err| { .set_panel_od(lock.panel_od)
warn!("CtrlCharge: set_limit {}", err); .map_err(|err| {
err warn!("CtrlCharge: set_limit {}", err);
}) err
.ok(); })
.ok();
}
} }
}, },
move || {}, move || {},
move || { move || {
info!("CtrlRogBios reloading panel_od"); info!("CtrlRogBios reloading panel_od");
if let Ok(lock) = platform2.config.try_lock() { if let Ok(lock) = platform2.config.try_lock() {
platform2 if platform2.platform.has_panel_od() {
.set_panel_od(lock.panel_od) platform2
.map_err(|err| { .set_panel_od(lock.panel_od)
warn!("CtrlCharge: set_limit {}", err); .map_err(|err| {
err warn!("CtrlCharge: set_limit {}", err);
}) err
.ok(); })
.ok();
}
} }
}, },
) )

4
daemon/src/daemon.rs
View File

@@ -85,7 +85,7 @@ async fn start_daemon(executor: &mut Executor<'_>) -> Result<(), Box<dyn Error>>
Ok(mut ctrl) => { Ok(mut ctrl) => {
// Do a reload of any settings // Do a reload of any settings
ctrl.reload() ctrl.reload()
.unwrap_or_else(|err| warn!("Battery charge limit: {}", err)); .unwrap_or_else(|err| warn!("CtrlRogBios: {}", err));
// Then register to dbus server // Then register to dbus server
ctrl.add_to_server(&mut connection).await; ctrl.add_to_server(&mut connection).await;
@@ -101,7 +101,7 @@ async fn start_daemon(executor: &mut Executor<'_>) -> Result<(), Box<dyn Error>>
Ok(mut ctrl) => { Ok(mut ctrl) => {
// Do a reload of any settings // Do a reload of any settings
ctrl.reload() ctrl.reload()
.unwrap_or_else(|err| warn!("Battery charge limit: {}", err)); .unwrap_or_else(|err| warn!("CtrlPower: {}", err));
// Then register to dbus server // Then register to dbus server
ctrl.add_to_server(&mut connection).await; ctrl.add_to_server(&mut connection).await;