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

Allow battery energy to reset to zero #122

Merged
merged 9 commits into from
Oct 24, 2022
Merged

Allow battery energy to reset to zero #122

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5bddb97
Allow battery energy to reset
WillCodeForCats Oct 6, 2022
5f281d1
Change log error level to warning
WillCodeForCats Oct 6, 2022
0be7e94
Merge branch 'main' into battery
WillCodeForCats Oct 10, 2022
34f379a
Merge branch 'main' into battery
WillCodeForCats Oct 13, 2022
34b408f
Merge branch 'main' into battery
WillCodeForCats Oct 13, 2022
ca60c44
Fix logging strings
WillCodeForCats Oct 13, 2022
d3727d0
User friendly log descriptions
WillCodeForCats Oct 13, 2022
556a618
Merge branch 'main' into battery
WillCodeForCats Oct 20, 2022
6c52d4e
Update sensor.py
WillCodeForCats Oct 24, 2022
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
62 changes: 50 additions & 12 deletions custom_components/solaredge_modbus_multi/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ class SolarEdgeBatteryEnergyExport(SolarEdgeSensorBase):
def __init__(self, platform, config_entry, coordinator):
super().__init__(platform, config_entry, coordinator)
"""Initialize the sensor."""
self.last = None
self._last = None

@property
def unique_id(self) -> str:
Expand All @@ -1844,12 +1844,31 @@ def native_value(self):

else:
try:
return watts_to_kilowatts(
update_accum(
self, self._platform.decoded_model["B_Export_Energy_WH"]
if self._last is None:
self._last = 0

if self._platform.decoded_model["B_Export_Energy_WH"] >= self._last:
self._last = self._platform.decoded_model["B_Export_Energy_WH"]

return watts_to_kilowatts(
self._platform.decoded_model["B_Export_Energy_WH"]
)
)
except Exception:

else:
_LOGGER.warning(
(
"Battery Export Energy went backwards: "
f"{self._platform.decoded_model['B_Export_Energy_WH']} "
f"< {self._last}"
)
),

if self._platform.decoded_model["B_Export_Energy_WH"] == 0x0:
self._last = None

return None

except OverflowError:
return None

except TypeError:
Expand All @@ -1865,7 +1884,7 @@ class SolarEdgeBatteryEnergyImport(SolarEdgeSensorBase):
def __init__(self, platform, config_entry, coordinator):
super().__init__(platform, config_entry, coordinator)
"""Initialize the sensor."""
self.last = None
self._last = None

@property
def unique_id(self) -> str:
Expand All @@ -1883,12 +1902,31 @@ def native_value(self):

else:
try:
return watts_to_kilowatts(
update_accum(
self, self._platform.decoded_model["B_Import_Energy_WH"]
if self._last is None:
self._last = 0

if self._platform.decoded_model["B_Import_Energy_WH"] >= self._last:
self._last = self._platform.decoded_model["B_Import_Energy_WH"]

return watts_to_kilowatts(
self._platform.decoded_model["B_Import_Energy_WH"]
)
)
except Exception:

else:
_LOGGER.warning(
(
"Battery Import Energy went backwards: "
f"{self._platform.decoded_model['B_Import_Energy_WH']} "
f"< {self._last}"
)
),

if self._platform.decoded_model["B_Import_Energy_WH"] == 0x0:
self._last = None

return None

except OverflowError:
return None

except TypeError:
Expand Down