max/hass-fpl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yordan Suarez
2022-07-17 03:53:54 -04:00
parent 6c76ea4730 7baac81417
commit 8f23e37803
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
custom_components/fpl/fplapi.py
View File

@@ -294,13 +294,15 @@ class FplApi(object):
): ):
dailyUsage.append( dailyUsage.append(
{ {
"usage": daily["kwhUsed"], "usage": daily.get("kwhUsed"),
"cost": daily["billingCharge"], "cost": daily.get("billingCharge"),
"date": daily["date"], "date": daily.get("date"),
"max_temperature": daily["averageHighTemperature"], "max_temperature": daily.get(
"netDeliveredKwh": daily["netDeliveredKwh"], "averageHighTemperature"
"netReceivedKwh": daily["netReceivedKwh"], ),
"readTime": daily["readTime"], "netDeliveredKwh": daily.get("netDeliveredKwh"),
"netReceivedKwh": daily.get("netReceivedKwh"),
"readTime": daily.get("readTime"),
} }
) )
# totalPowerUsage += int(daily["kwhUsed"]) # totalPowerUsage += int(daily["kwhUsed"])
@@ -308,12 +310,12 @@ class FplApi(object):
# data["total_power_usage"] = totalPowerUsage # data["total_power_usage"] = totalPowerUsage
data["daily_usage"] = dailyUsage data["daily_usage"] = dailyUsage
data["projectedKWH"] = r["CurrentUsage"]["projectedKWH"] data["projectedKWH"] = r["CurrentUsage"].get("projectedKWH")
data["dailyAverageKWH"] = r["CurrentUsage"]["dailyAverageKWH"] data["dailyAverageKWH"] = r["CurrentUsage"].get("dailyAverageKWH")
data["billToDateKWH"] = r["CurrentUsage"]["billToDateKWH"] data["billToDateKWH"] = r["CurrentUsage"].get("billToDateKWH")
data["recMtrReading"] = r["CurrentUsage"]["recMtrReading"] data["recMtrReading"] = r["CurrentUsage"].get("recMtrReading")
data["delMtrReading"] = r["CurrentUsage"]["delMtrReading"] data["delMtrReading"] = r["CurrentUsage"].get("delMtrReading")
data["billStartDate"] = r["CurrentUsage"]["billStartDate"] data["billStartDate"] = r["CurrentUsage"].get("billStartDate")
return data return data
async def __getDataFromApplianceUsage(self, account, lastBilledDate) -> dict: async def __getDataFromApplianceUsage(self, account, lastBilledDate) -> dict:

2
custom_components/fpl/sensor_KWHSensor.py
View File

@@ -31,7 +31,7 @@ class DailyAverageKWHSensor(FplEnergyEntity):
class DailyAverageKWHSensor(FplEntity): class DailyAverageKWHSensor(FplEntity):
>>>>>>> master >>>>>>> master
def __init__(self, coordinator, config, account): def __init__(self, coordinator, config, account):
super().__init__(coordinator, config, account, "Daily Average") super().__init__(coordinator, config, account, "Daily Average KWH")
@property @property
def state(self): def state(self):