From eba9dc8a525642b8998d5355915bd79a87d2b21a Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Sun, 21 Aug 2022 21:28:52 +1200
Subject: [PATCH] daemon: update an old log comment. Don't reload panel_od if
 not available

Closes #242
---
 daemon/src/ctrl_platform.rs | 46 +++++++++++++++++++++----------------
 daemon/src/daemon.rs        |  4 ++--
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/daemon/src/ctrl_platform.rs b/daemon/src/ctrl_platform.rs
index 36df38ce..794993b9 100644
--- a/daemon/src/ctrl_platform.rs
+++ b/daemon/src/ctrl_platform.rs
@@ -245,12 +245,14 @@ impl crate::ZbusAdd for CtrlRogBios {
 
 impl crate::Reloadable for CtrlRogBios {
     fn reload(&mut self) -> Result<(), RogError> {
-        let p = if let Ok(lock) = self.config.try_lock() {
-            lock.panel_od
-        } else {
-            false
-        };
-        self.set_panel_od(p)?;
+        if self.platform.has_panel_od() {
+            let p = if let Ok(lock) = self.config.try_lock() {
+                lock.panel_od
+            } else {
+                false
+            };
+            self.set_panel_od(p)?;
+        }
         Ok(())
     }
 }
@@ -266,26 +268,30 @@ impl CtrlTask for CtrlRogBios {
             move || {
                 info!("CtrlRogBios reloading panel_od");
                 if let Ok(lock) = platform1.config.try_lock() {
-                    platform1
-                        .set_panel_od(lock.panel_od)
-                        .map_err(|err| {
-                            warn!("CtrlCharge: set_limit {}", err);
-                            err
-                        })
-                        .ok();
+                    if platform1.platform.has_panel_od() {
+                        platform1
+                            .set_panel_od(lock.panel_od)
+                            .map_err(|err| {
+                                warn!("CtrlCharge: set_limit {}", err);
+                                err
+                            })
+                            .ok();
+                    }
                 }
             },
             move || {},
             move || {
                 info!("CtrlRogBios reloading panel_od");
                 if let Ok(lock) = platform2.config.try_lock() {
-                    platform2
-                        .set_panel_od(lock.panel_od)
-                        .map_err(|err| {
-                            warn!("CtrlCharge: set_limit {}", err);
-                            err
-                        })
-                        .ok();
+                    if platform2.platform.has_panel_od() {
+                        platform2
+                            .set_panel_od(lock.panel_od)
+                            .map_err(|err| {
+                                warn!("CtrlCharge: set_limit {}", err);
+                                err
+                            })
+                            .ok();
+                    }
                 }
             },
         )
diff --git a/daemon/src/daemon.rs b/daemon/src/daemon.rs
index f70c698d..d0a39896 100644
--- a/daemon/src/daemon.rs
+++ b/daemon/src/daemon.rs
@@ -85,7 +85,7 @@ async fn start_daemon(executor: &mut Executor<'_>) -> Result<(), Box<dyn Error>>
         Ok(mut ctrl) => {
             // Do a reload of any settings
             ctrl.reload()
-                .unwrap_or_else(|err| warn!("Battery charge limit: {}", err));
+                .unwrap_or_else(|err| warn!("CtrlRogBios: {}", err));
             // Then register to dbus server
             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) => {
             // Do a reload of any settings
             ctrl.reload()
-                .unwrap_or_else(|err| warn!("Battery charge limit: {}", err));
+                .unwrap_or_else(|err| warn!("CtrlPower: {}", err));
             // Then register to dbus server
             ctrl.add_to_server(&mut connection).await;