fix scheduled charging and electricity tariff (openWB#1927)

ndrsnhs · Oct 10, 2024 · 1768b58 · 1768b58
1 parent 95904d8
commit 1768b58
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/control/ev.py b/packages/control/ev.py
@@ -914,7 +914,8 @@ def scheduled_charging_calc_current(self,
                     message = self.SCHEDULED_CHARGING_CHEAP_HOUR
                     current = plan_data.available_current
                     submode = "instant_charging"
-                elif soc <= limit.soc_limit:
+                elif ((limit.selected == "soc" and soc <= limit.soc_limit) or
+                      (limit.selected == "amount" and used_amount < limit.amount)):
                     message = self.SCHEDULED_CHARGING_EXPENSIVE_HOUR
                     current = min_current
                     submode = "pv_charging"