Skip to content
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

Avoid resetting charge window when charge isn't enabled #549

Merged
merged 2 commits into from
Dec 29, 2023
Merged

Avoid resetting charge window when charge isn't enabled #549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2277f83
Avoid resetting charge window when charge isn't enabled
springfall2008 Dec 29, 2023
a5a44ff
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Dec 29, 2023
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
30 changes: 20 additions & 10 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.27"
THIS_VERSION = "v7.14.28"
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 @@ -447,7 +447,7 @@
"options": PREDBAT_MODE_OPTIONS,
"icon": "mdi:state-machine",
"default": PREDBAT_MODE_OPTIONS[PREDBAT_MODE_CONTROL_CHARGEDISCHARGE],
"reset_inverter": True,
"reset_inverter_force": True,
},
{
"name": "update",
Expand Down Expand Up @@ -8677,13 +8677,20 @@ def reset_inverter(self):
if not self.set_read_only or self.inverter_needs_reset_force:
# Don't reset in read only mode unless forced
for inverter in self.inverters:
self.log("Reset inverter settings to safe mode")
inverter.adjust_charge_rate(inverter.battery_rate_max_charge * 60.0 * 1000.0)
inverter.adjust_discharge_rate(inverter.battery_rate_max_discharge * 60 * 1000)
inverter.adjust_force_discharge(False)
inverter.adjust_reserve(0)
inverter.adjust_battery_target(100.0)
inverter.disable_charge_window()
self.log(
"Reset inverter settings to safe mode (set_charge_window={} set_discharge_window={} force={})".format(
self.set_charge_window, self.set_discharge_window, self.inverter_needs_reset_force
)
)
if self.set_charge_window or self.inverter_needs_reset_force:
inverter.adjust_charge_rate(inverter.battery_rate_max_charge * 60.0 * 1000.0)
inverter.disable_charge_window()
inverter.adjust_battery_target(100.0)
if self.set_charge_window or self.set_discharge_window or self.inverter_needs_reset_force:
inverter.adjust_reserve(0)
if self.set_discharge_window or self.inverter_needs_reset_force:
inverter.adjust_discharge_rate(inverter.battery_rate_max_discharge * 60 * 1000)
inverter.adjust_force_discharge(False)
self.inverter_needs_reset = False
self.inverter_needs_reset_force = False

Expand Down Expand Up @@ -9697,24 +9704,27 @@ def fetch_config_options(self):
self.calculate_best_charge = True
self.calculate_best_discharge = False
self.set_charge_window = False
self.set_discharge_window = False
elif self.predbat_mode == PREDBAT_MODE_OPTIONS[PREDBAT_MODE_CONTROL_CHARGE]:
self.calculate_best_charge = True
self.calculate_best_discharge = False
self.set_charge_window = True
self.set_discharge_window = False
elif self.predbat_mode == PREDBAT_MODE_OPTIONS[PREDBAT_MODE_CONTROL_CHARGEDISCHARGE]:
self.calculate_best_charge = True
self.calculate_best_discharge = True
self.set_charge_window = True
self.set_discharge_window = True
else: # PREDBAT_MODE_OPTIONS[PREDBAT_MODE_MONITOR]
self.calculate_best_charge = False
self.calculate_best_discharge = False
self.set_charge_window = False
self.set_discharge_window = False
self.predbat_mode = PREDBAT_MODE_OPTIONS[PREDBAT_MODE_MONITOR]
self.expose_config("mode", self.predbat_mode)

self.log("Predbat mode is set to {}".format(self.predbat_mode))

self.set_discharge_window = self.calculate_best_discharge
self.calculate_discharge_oncharge = self.get_arg("calculate_discharge_oncharge")
self.calculate_second_pass = self.get_arg("calculate_second_pass")
self.calculate_inday_adjustment = self.get_arg("calculate_inday_adjustment")
Expand Down