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

Fix crash with .replace in battery power curve code #663

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Fix crash with .replace in battery power curve code #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58eacb7
Fix crash with .replace in battery power curve code
springfall2008 Jan 29, 2024
01aeff8
Update apps.yaml - change number to sensor
springfall2008 Jan 29, 2024
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
4 changes: 2 additions & 2 deletions apps/predbat/config/apps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ pred_bat:
- number.givtcp_{geserial}_battery_discharge_rate
- number.givtcp2_{geserial2}_battery_discharge_rate
battery_power:
- number.givtcp_{geserial}_battery_power
- number.givtcp2_{geserial2}_battery_power
- sensor.givtcp_{geserial}_battery_power
- sensor.givtcp2_{geserial2}_battery_power
pv_power:
- number.givtcp_{geserial}_pv_power
- number.givtcp2_{geserial2}_pv_power
Expand Down
6 changes: 3 additions & 3 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.15.3"
THIS_VERSION = "v7.15.4"
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 @@ -989,11 +989,11 @@ def find_charge_curve(self):
charge_rate_sensor = self.base.get_arg("charge_rate", indirect=False, index=self.id)
predbat_status_sensor = "predbat.status"
battery_power_sensor = self.base.get_arg("battery_power", indirect=False, index=self.id)
battery_power_sensor = battery_power_sensor.replace("number.", "sensor.") # Workaround as old template had number.
final_curve = {}

max_power = int(self.battery_rate_max_charge * 1000.0 * 60.0)
if soc_kwh_sensor and charge_rate_sensor:
if soc_kwh_sensor and charge_rate_sensor and battery_power_sensor and predbat_status_sensor:
battery_power_sensor = battery_power_sensor.replace("number.", "sensor.") # Workaround as old template had number.
self.log("Find charge curve with sensors {} and {} and {} and {}".format(soc_kwh_sensor, charge_rate_sensor, predbat_status_sensor, battery_power_sensor))
soc_kwh_data = self.base.get_history(entity_id=soc_kwh_sensor, days=self.base.max_days_previous)
charge_rate_data = self.base.get_history(entity_id=charge_rate_sensor, days=self.base.max_days_previous)
Expand Down
Loading