Skip to content

Fix to allow continued operation after REST error #609

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
Jan 12, 2024
Merged

Fix to allow continued operation after REST error #609

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
37 changes: 19 additions & 18 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.38"
THIS_VERSION = "v7.14.39"
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 @@ -1248,7 +1248,7 @@ def adjust_reserve(self, reserve):
if SIMULATE:
self.base.sim_reserve = reserve
else:
if self.rest_api:
if self.rest_data:
self.rest_setReserve(reserve)
else:
entity_soc = self.base.get_entity(self.base.get_arg("reserve", indirect=False, index=self.id))
Expand Down Expand Up @@ -1296,7 +1296,7 @@ def adjust_charge_rate(self, new_rate, notify=True):
if SIMULATE:
self.base.sim_charge_rate_now = new_rate
else:
if self.rest_api:
if self.rest_data:
self.rest_setChargeRate(new_rate)
else:
entity = self.base.get_entity(self.base.get_arg("charge_rate", indirect=False, index=self.id))
Expand Down Expand Up @@ -1345,7 +1345,7 @@ def adjust_discharge_rate(self, new_rate, notify=True):
if SIMULATE:
self.base.sim_discharge_rate_now = new_rate
else:
if self.rest_api:
if self.rest_data:
self.rest_setDischargeRate(new_rate)
else:
entity = self.base.get_entity(self.base.get_arg("discharge_rate", indirect=False, index=self.id))
Expand Down Expand Up @@ -1396,7 +1396,7 @@ def adjust_battery_target(self, soc):
if SIMULATE:
self.base.sim_soc = soc
else:
if self.rest_api:
if self.rest_data:
self.rest_setChargeTarget(soc)
else:
entity_soc = self.base.get_entity(self.base.get_arg("charge_limit", indirect=False, index=self.id))
Expand Down Expand Up @@ -1528,7 +1528,7 @@ def adjust_inverter_mode(self, force_discharge, changed_start_end=False):
old_inverter_mode = self.rest_data["Control"]["Mode"]
else:
# Inverter mode
if changed_start_end and not self.rest_api:
if changed_start_end and not self.rest_data:
# XXX: Workaround for GivTCP window state update time to take effort
self.base.log("Sleeping (workaround) as start/end of discharge window was just adjusted")
time.sleep(30)
Expand All @@ -1549,7 +1549,7 @@ def adjust_inverter_mode(self, force_discharge, changed_start_end=False):
if SIMULATE:
self.base.sim_inverter_mode = new_inverter_mode
else:
if self.rest_api:
if self.rest_data:
self.rest_setBatteryMode(new_inverter_mode)
else:
entity = self.base.get_entity(self.base.get_arg("inverter_mode", indirect=False, index=self.id))
Expand Down Expand Up @@ -1634,7 +1634,7 @@ def adjust_force_discharge(self, force_discharge, new_start_time=None, new_end_t
if SIMULATE:
self.base.sim_discharge_start = new_start
else:
if self.rest_api:
if self.rest_data:
pass # REST writes as a single start/end time

elif "discharge_start_time" in self.base.args:
Expand All @@ -1661,7 +1661,7 @@ def adjust_force_discharge(self, force_discharge, new_start_time=None, new_end_t
if SIMULATE:
self.base.sim_discharge_end = new_end
else:
if self.rest_api:
if self.rest_data:
pass # REST writes as a single start/end time
elif "discharge_end_time" in self.base.args:
# Always write to this as it is the GE default
Expand All @@ -1688,7 +1688,7 @@ def adjust_force_discharge(self, force_discharge, new_start_time=None, new_end_t
self.press_and_poll_button(entity_id)

# REST version of writing slot
if self.rest_api and new_start and new_end and ((new_start != old_start) or (new_end != old_end)):
if self.rest_data and new_start and new_end and ((new_start != old_start) or (new_end != old_end)):
changed_start_end = True
if not SIMULATE:
self.rest_setDischargeSlot1(new_start, new_end)
Expand Down Expand Up @@ -1742,7 +1742,7 @@ def disable_charge_window(self, notify=True):
if old_charge_schedule_enable == "on" or old_charge_schedule_enable == "enable":
if not SIMULATE:
# Enable scheduled charge if not turned on
if self.rest_api:
if self.rest_data:
self.rest_enableChargeSchedule(False)
else:
entity = self.base.get_entity(self.base.get_arg("scheduled_charge_enable", indirect=False, index=self.id))
Expand Down Expand Up @@ -1919,7 +1919,7 @@ def adjust_charge_window(self, charge_start_time, charge_end_time, minutes_now):
in_new_window = True

# Disable charging if required, for REST no need as we change start and end together anyhow
if not in_new_window and not self.rest_api and ((new_start != old_start) or (new_end != old_end)):
if not in_new_window and not self.rest_data and ((new_start != old_start) or (new_end != old_end)):
if self.inv_has_charge_enable_time:
self.disable_charge_window(notify=False)
have_disabled = True
Expand All @@ -1930,7 +1930,7 @@ def adjust_charge_window(self, charge_start_time, charge_end_time, minutes_now):
self.base.sim_charge_start_time = new_start
self.base.log("Simulate sim_charge_start_time now {}".format(new_start))
else:
if self.rest_api:
if self.rest_data:
pass # REST will be written as start/end together
elif "charge_start_time" in self.base.args:
# Always write to this as it is the GE default
Expand All @@ -1955,7 +1955,7 @@ def adjust_charge_window(self, charge_start_time, charge_end_time, minutes_now):
self.base.sim_charge_end_time = new_end
self.base.log("Simulate sim_charge_end_time now {}".format(new_end))
else:
if self.rest_api:
if self.rest_data:
pass # REST will be written as start/end together
elif "charge_end_time" in self.base.args:
# Always write to this as it is the GE default
Expand All @@ -1974,7 +1974,7 @@ def adjust_charge_window(self, charge_start_time, charge_end_time, minutes_now):
self.log("WARN: Inverter {} unable write charge window end as neither REST, charge_end_hour or charge_end_time are set".format(self.id))

if new_start != old_start or new_end != old_end:
if self.rest_api and not SIMULATE:
if self.rest_data and not SIMULATE:
self.rest_setChargeSlot1(new_start, new_end)

# For Solis inverters we also have to press the update_charge_discharge button to send the times to the inverter
Expand All @@ -1990,7 +1990,7 @@ def adjust_charge_window(self, charge_start_time, charge_end_time, minutes_now):
if old_charge_schedule_enable == "off" or old_charge_schedule_enable == "disable" or have_disabled:
if not SIMULATE:
# Enable scheduled charge if not turned on
if self.rest_api:
if self.rest_data:
self.rest_enableChargeSchedule(True)
elif "scheduled_charge_enable" in self.base.args:
entity = self.base.get_entity(self.base.get_arg("scheduled_charge_enable", indirect=False, index=self.id))
Expand Down Expand Up @@ -2703,9 +2703,10 @@ def futurerate_analysis(self):
mdata_export = self.minute_data(array_values, self.forecast_days + 1, self.midnight_utc, "rate_export", "from", backwards=False, to_key="to")

future_data = []
for minute in range(self.minutes_now, self.forecast_plan_hours * 60 + self.minutes_now, 60):
minute_now_hour = int(self.minutes_now / 60) * 60
for minute in range(minute_now_hour, self.forecast_plan_hours * 60 + minute_now_hour, 60):
if mdata_import.get(minute) or mdata_export.get(minute):
future_data.append("{} => {} / {}".format(minute, mdata_import.get(minute), mdata_export.get(minute)))
future_data.append("{} => {} / {}".format(self.time_abs_str(minute), mdata_import.get(minute), mdata_export.get(minute)))

self.log("Predicted future rates: {}".format(future_data))
return mdata_import, mdata_export
Expand Down