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

Fixing sensor metadata

Browse Source
This commit is contained in:
Adam Outler
2021-12-30 15:07:04 -05:00
parent 621fea3042
commit 485717d662
5 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
custom_components/fpl/sensor_DailyUsageSensor.py
View File

@@ -9,7 +9,7 @@ class FplDailyUsageSensor(FplEntity):
def state(self):
data = self.getData("daily_usage")
if ((data is not None) and (len(data) > 0)):
if (data is not None) and (len(data) > 0):
return data[-1]["cost"]
return None
@@ -22,8 +22,11 @@ class FplDailyUsageSensor(FplEntity):
attributes["device_class"] = "monetary"
attributes["state_class"] = "total_increasing"
attributes["unit_of_measurement"] = "$"
if ((data is not None) and (data[-1]["cost"] is not None)):
attributes["date"] = data[-1]["readTime"]
if data is not None:
if (data[-1] is not None) and (data[-1]["readTime"] is not None):
attributes["date"] = data[-1]["readTime"]
if (data[-2] is not None) and (data[-2]["readTime"] is not None):
attributes["last_reset"] = data[-2]["readTime"]
return attributes
@property
@@ -39,7 +42,7 @@ class FplDailyUsageKWHSensor(FplEntity):
def state(self):
data = self.getData("daily_usage")
if ((data is not None) and (data[-1]["usage"] is not None)):
if (data is not None) and (data[-1]["usage"] is not None):
return data[-1]["usage"]
return None
@@ -55,17 +58,18 @@ class FplDailyUsageKWHSensor(FplEntity):
attributes["unit_of_measurement"] = "kWh"
if data is not None:
if ((data[-1] is not None) and (data[-1]["readTime"] is not None)):
if (data[-1] is not None) and (data[-1]["readTime"] is not None):
attributes["date"] = data[-1]["readTime"]
if ((data[-2] is not None) and (data[-2]["readTime"] is not None)):
if (data[-2] is not None) and (data[-2]["readTime"] is not None):
attributes["last_reset"] = data[-2]["readTime"]
return attributes
@property
def icon(self):
return "mdi:flash"
class FplDailyReceivedKWHSensor(FplEntity):
def __init__(self, coordinator, config, account):
super().__init__(coordinator, config, account, "Daily Received KWH")
@@ -73,7 +77,10 @@ class FplDailyReceivedKWHSensor(FplEntity):
@property
def state(self):
data = self.getData("daily_usage")
return data[-1]["netReceivedKwh"]
try:
return data[-1]["netReceivedKwh"]
except:
return 0
def defineAttributes(self):
"""Return the state attributes."""
@@ -84,15 +91,18 @@ class FplDailyReceivedKWHSensor(FplEntity):
attributes["device_class"] = "energy"
attributes["state_class"] = "total_increasing"
attributes["unit_of_measurement"] = "kWh"
attributes["date"] = data[-1]["readTime"]
attributes["last_reset"] = data[-2]["readTime"]
if data is not None:
if (data[-1] is not None) and (data[-1]["readTime"] is not None):
attributes["date"] = data[-1]["readTime"]
if (data[-2] is not None) and (data[-2]["readTime"] is not None):
attributes["last_reset"] = data[-2]["readTime"]
return attributes
@property
def icon(self):
return "mdi:flash"
class FplDailyDeliveredKWHSensor(FplEntity):
def __init__(self, coordinator, config, account):
super().__init__(coordinator, config, account, "Daily Delivered KWH")
@@ -100,7 +110,7 @@ class FplDailyDeliveredKWHSensor(FplEntity):
@property
def state(self):
data = self.getData("daily_usage")
return data[-1]["netDeliveredKwh"]
return data[-1]["netDeliveredKwh"]
def defineAttributes(self):
"""Return the state attributes."""
@@ -111,8 +121,11 @@ class FplDailyDeliveredKWHSensor(FplEntity):
attributes["device_class"] = "energy"
attributes["state_class"] = "total_increasing"
attributes["unit_of_measurement"] = "kWh"
attributes["date"] = data[-1]["readTime"]
attributes["last_reset"] = data[-2]["readTime"]
if data is not None:
if (data[-1] is not None) and (data[-1]["readTime"] is not None):
attributes["date"] = data[-1]["readTime"]
if (data[-2] is not None) and (data[-2]["readTime"] is not None):
attributes["last_reset"] = data[-2]["readTime"]
return attributes
@property