simplified condition for Time-To-Go/Soc

Louisvdw · Apr 27, 2023 · 83668b6 · 83668b6
1 parent bc91973
commit 83668b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/etc/dbus-serialbattery/dbushelper.py b/etc/dbus-serialbattery/dbushelper.py
@@ -498,22 +498,14 @@ def publish_dbus(self):
             except:
                 pass
 
-        # Update TimeToSoC
+        # Update TimeToGo and/or TimeToSoC
         try:
             if (
                 self.battery.capacity is not None
                 and (TIME_TO_GO_ENABLE or len(TIME_TO_SOC_POINTS) > 0)
                 and (
-                    (
-                        # update only once in same second
-                        int(time()) != self.battery.time_to_soc_update
-                        and
-                        # update only every x seconds
-                        int(time()) % TIME_TO_SOC_RECALCULATE_EVERY == 0
-                    )
-                    or
-                    # update on first run
-                    self.battery.time_to_soc_update == 0
+                    int(time()) - self.battery.time_to_soc_update
+                    >= TIME_TO_SOC_RECALCULATE_EVERY
                 )
             ):
                 self.battery.time_to_soc_update = int(time())

diff --git a/etc/dbus-serialbattery/mnb.py b/etc/dbus-serialbattery/mnb.py
@@ -3,7 +3,7 @@
 from struct import *
 
 # from test_max17853 import *#{these two lines are mutually}
-from util_max17853 import *  # {exclusive. use test for testing}
+# from util_max17853 import *  # {exclusive. use test for testing}
 
 
 class MNBProtection(Protection):