Skip to content

Fix peakPower and some battery info #7

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

Open
jaesbit wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix peakPower and some battery info #7

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
25d9882
Change peekPower to refreshPeekPower
jaesbit Mar 22, 2023
a3ef398
Fix battery info by taking type instead onLineStr
jaesbit Mar 22, 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
3 changes: 2 additions & 1 deletion custom_components/saj_esolar_air/esolar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ def web_get_plant_detailed_chart(session, plant_info):
if (plant_chart["type"]) == 0:
tmp = {}
tmp.update({"devicesn": inverter})
tmp.update({"peakPower": plant_chart["peakPower"]})
# I'm not sure about wich kind of data we need to pick here
tmp.update({"peakPower": plant_chart["refreshPeakPower"]})
peak_pow.append(tmp)
plant.update({"peakList": peak_pow})
# plant.update({"peakPower": plant_chart["peakPower"]})
Expand Down
15 changes: 7 additions & 8 deletions custom_components/saj_esolar_air/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ async def async_update(self) -> None:
if "kitList" not in plant or plant["kitList"] is None:
continue
for kit in plant["kitList"]:
if inverter == kit["devicesn"] and kit["onLineStr"] == "1":
if inverter == kit["devicesn"] and kit["type"] == 2:
installed_power += kit["storeDevicePower"]["batCapcity"]
available_power += (
kit["storeDevicePower"]["batCapcity"]
Expand All @@ -724,7 +724,7 @@ def native_value(self) -> float | None:
if "kitList" not in plant or plant["kitList"] is None:
continue
for kit in plant["kitList"]:
if inverter == kit["devicesn"] and kit["onLineStr"] == "1":
if inverter == kit["devicesn"] and kit["type"] == 2:
installed_power += kit["storeDevicePower"]["batCapcity"]
available_power += (
kit["storeDevicePower"]["batCapcity"]
Expand Down Expand Up @@ -1139,18 +1139,17 @@ async def async_update(self) -> None:
if "kitList" not in plant or plant["kitList"] is None:
continue
for kit in plant["kitList"]:
if kit["devicesn"] == self.inverter_sn:
if kit["devicesn"] == self.inverter_sn and kit["type"] == 2:
self._attr_extra_state_attributes[I_MODEL] = kit["devicetype"]
self._attr_extra_state_attributes[I_SN] = kit["devicesn"]
self._attr_extra_state_attributes[B_CAPACITY] = kit[
"storeDevicePower"
]["batCapcityStr"]

# Setup state
if kit["onLineStr"] == "1":
self._attr_native_value = kit["storeDevicePower"][
"batEnergyPercent"
]
self._attr_native_value = kit["storeDevicePower"][
"batEnergyPercent"
]

@property
def native_value(self) -> float | None:
Expand All @@ -1163,7 +1162,7 @@ def native_value(self) -> float | None:
if "kitList" not in plant or plant["kitList"] is None:
continue
for kit in plant["kitList"]:
if self.inverter_sn == kit["devicesn"] and kit["onLineStr"] == "1":
if self.inverter_sn == kit["devicesn"] and kit["type"] == 2:
value = float(kit["storeDevicePower"]["batEnergyPercent"])

# Setup dynamic attributes
Expand Down