Skip to content

Fix constant reset inverter issue with previous release #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
springfall2008 merged 1 commit into from
Dec 25, 2023
Merged

Fix constant reset inverter issue with previous release #526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/predbat/predbat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import os
import yaml

THIS_VERSION = "v7.14.22"
THIS_VERSION = "v7.14.23"
TIME_FORMAT = "%Y-%m-%dT%H:%M:%S%z"
TIME_FORMAT_SECONDS = "%Y-%m-%dT%H:%M:%S.%f%z"
TIME_FORMAT_OCTOPUS = "%Y-%m-%d %H:%M:%S%z"
Expand Down Expand Up @@ -456,7 +456,6 @@
"options": PREDBAT_UPDATE_OPTIONS,
"icon": "mdi:state-machine",
"default": "Unknown",
"reset_inverter": True,
},
{"name": "auto_update", "friendly_name": "Predbat automatic update enable", "type": "switch", "default": False},
{"name": "load_filter_modal", "friendly_name": "Apply modal filter historical load", "type": "switch", "enable": "expert_mode", "default": True},
Expand Down Expand Up @@ -4049,7 +4048,7 @@ def run_prediction(self, charge_limit, charge_window, discharge_window, discharg
predict_export[minute] = 0

# Soc at next charge start
if minute < first_charge:
if minute <= first_charge:
first_charge_soc = prev_soc

# Have we past the charging or discharging time?
Expand Down Expand Up @@ -8781,7 +8780,7 @@ def execute_plan(self):
# Set configured window minutes for the SOC adjustment routine
inverter.charge_start_time_minutes = minutes_start
inverter.charge_end_time_minutes = minutes_end
elif (minutes_start >= (24 * 60)) and (inverter.charge_start_time_minutes - self.minutes_now) <= self.set_window_minutes:
elif ((minutes_start - self.minutes_now) >= (24 * 60)) and (inverter.charge_start_time_minutes - self.minutes_now) <= self.set_window_minutes:
# No charging require in the next 24 hours
self.log("No charge window required, disabling before the start")
inverter.disable_charge_window()
Expand Down Expand Up @@ -9975,10 +9974,13 @@ def expose_config(self, name, value, quiet=True, event=False):
if entity and ((item.get("value") is None) or (value != item["value"])):
if item.get("reset_inverter", False):
self.inverter_needs_reset = True
self.log("Set reset inverter true due to reset_inverter on item {}".format(item))
if item.get("reset_inverter_force", False):
self.inverter_needs_reset = True
self.log("Set reset inverter true due to reset_inverter_force on item {}".format(item))
if event:
self.inverter_needs_reset_force = True
self.log("Set reset inverter force true due to reset_inverter_force on item {}".format(item))
item["value"] = value
if not quiet:
self.log("Updating HA config {} to {}".format(name, value))
Expand Down