Merge branch 'openWB:master' into zabbix-monitoring

openWB · Jan 21, 2025 · 2e5783b · 2e5783b
2 parents 50eb96a + 12775cd
commit 2e5783b
Show file tree

Hide file tree

Showing 358 changed files with 2,561 additions and 2,365 deletions.
diff --git a/packages/control/counter.py b/packages/control/counter.py
@@ -120,7 +120,8 @@ def _get_loadmanagement_state(self) -> None:
         if self.data.get.fault_state == FaultStateLevel.ERROR:
             if self.data.set.error_timer is None:
                 self.data.set.error_timer = timecheck.create_timestamp()
-            if timecheck.check_timestamp(self.data.set.error_timer, self.MAX_EVU_ERROR_DURATION) is False:
+                return True
+            elif timecheck.check_timestamp(self.data.set.error_timer, self.MAX_EVU_ERROR_DURATION) is False:
                 for cp in connected_cps:
                     if self.num == data.data.counter_all_data.get_id_evu_counter():
                         data.data.cp_data[cp].set_state_and_log(

diff --git a/packages/modules/display_themes/cards/source/package-lock.json b/packages/modules/display_themes/cards/source/package-lock.json
diff --git a/...b/assets/ChargePointPlugBadge-D7ai0q3I.js → ...b/assets/ChargePointPlugBadge-CV-eneFK.js b/...b/assets/ChargePointPlugBadge-D7ai0q3I.js → ...b/assets/ChargePointPlugBadge-CV-eneFK.js
diff --git a/...s/web/assets/ChargePointsView-go1OQl3F.js → ...s/web/assets/ChargePointsView-B2Qojiic.js b/...s/web/assets/ChargePointsView-go1OQl3F.js → ...s/web/assets/ChargePointsView-B2Qojiic.js
diff --git a/...ards/web/assets/DashBoardCard-BqIRnhnk.js → ...ards/web/assets/DashBoardCard-Ds7Ht92x.js b/...ards/web/assets/DashBoardCard-BqIRnhnk.js → ...ards/web/assets/DashBoardCard-Ds7Ht92x.js
diff --git a/...ards/web/assets/DashBoardView-K8In7LJT.js → ...ards/web/assets/DashBoardView-BtH7_3ju.js b/...ards/web/assets/DashBoardView-K8In7LJT.js → ...ards/web/assets/DashBoardView-BtH7_3ju.js