From c7f41413b77d8ec1c561d62ffc6b9eba16c32445 Mon Sep 17 00:00:00 2001 From: Carsten Schmiemann Date: Wed, 19 Jul 2023 22:22:21 +0200 Subject: [PATCH] Save daily usage stats in victrom settings as well --- dbus-batrium-native/dbus-batrium-native.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dbus-batrium-native/dbus-batrium-native.py b/dbus-batrium-native/dbus-batrium-native.py index 4075771..c864898 100644 --- a/dbus-batrium-native/dbus-batrium-native.py +++ b/dbus-batrium-native/dbus-batrium-native.py @@ -100,6 +100,8 @@ class DbusBatteryService: 'MinCellVoltage': ['/Settings/Batrium/MinCellVoltage', 0.0,0.0,0.0], 'MaxCellVoltage': ['/Settings/Batrium/MaxCellVoltage', 0.0,0.0,0.0], 'TargetChargeVoltage': ['/Settings/Batrium/TargetChargeVoltage', 0.0,0.0,0.0], + 'HistoryChargedEnergy': ['/Settings/Batrium/HistoryChargedEnergy', 0.0,0.0,0.0], + 'HistoryDischargedEnergy': ['/Settings/Batrium/HistoryDischargedEnergy', 0.0,0.0,0.0], 'interval': ['/Settings/Batrium/Interval', 200, 200, 200] }, eventCallback=handle_changed_setting) @@ -133,6 +135,10 @@ class DbusBatteryService: ## Load settings from Venus OS config xml ## self._dbusservice['/History/AverageDischarge'] = self._settings['AvgDischarge'] self._dbusservice['/History/TotalAhDrawn'] = self._settings['TotalAhDrawn'] + self._dbusservice['/History/ChargedEnergy'] = self._settings['HistoryChargedEnergy'] + self._dbusservice['/History/DischargedEnergy'] = self._settings['HistoryDischargedEnergy'] + self.ChargedEnergy = self._settings['HistoryChargedEnergy'] + self.DischargedEnergy = self._settings['HistoryDischargedEnergy'] self._dbusservice.add_path('/History/TimeSinceLastFullCharge', 0) self._dbusservice.add_path('/History/MinCellVoltage', self._settings['MinCellVoltage']) self._dbusservice.add_path('/History/MaxCellVoltage', self._settings['MaxCellVoltage']) @@ -170,6 +176,8 @@ class DbusBatteryService: self._settings['MinCellVoltage'] = self._dbusservice['/History/MinCellVoltage'] self._settings['MaxCellVoltage'] = self._dbusservice['/History/MaxCellVoltage'] self._settings['TargetChargeVoltage'] = self._dbusservice['/Info/MaxChargeVoltage'] + self._settings['HistoryChargedEnergy'] = self._dbusservice['/History/ChargedEnergy'] + self._settings['HistoryDischargedEnergy'] = self._dbusservice['/History/DischargedEnergy'] def _daily_stats(self): ## Update daily statistics and reset energy counters