From 1a477c21677bf347f3d51f364140d47c403fd58c Mon Sep 17 00:00:00 2001
From: Yordan Suarez <ysantiago1985@gmail.com>
Date: Fri, 11 Jun 2021 16:00:54 -0400
Subject: [PATCH] Add daily usage in KWH

---
 custom_components/fpl/fplapi.py               |  1 -
 custom_components/fpl/sensor.py               |  3 +-
 .../fpl/sensor_DailyUsageSensor.py            | 29 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/custom_components/fpl/fplapi.py b/custom_components/fpl/fplapi.py
index 6a2877d..54cbd11 100644
--- a/custom_components/fpl/fplapi.py
+++ b/custom_components/fpl/fplapi.py
@@ -268,7 +268,6 @@ class FplApi(object):
             "accountType": "RESIDENTIAL",
             "revCode": "1",
             "premiseNumber": premise,
-            "meterNo": "D3117",
             "projectedBillFlag": True,
             "billComparisionFlag": True,
             "monthlyFlag": True,
diff --git a/custom_components/fpl/sensor.py b/custom_components/fpl/sensor.py
index ba887a5..616653c 100644
--- a/custom_components/fpl/sensor.py
+++ b/custom_components/fpl/sensor.py
@@ -23,7 +23,7 @@ from .sensor_AverageDailySensor import (
     BudgetDailyAverageSensor,
     ActualDailyAverageSensor,
 )
-from .sensor_DailyUsageSensor import FplDailyUsageSensor
+from .sensor_DailyUsageSensor import FplDailyUsageKWHSensor, FplDailyUsageSensor
 from .const import DOMAIN
 
 from .sensor_AllData import AllDataSensor
@@ -55,6 +55,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
         fpl_accounts.append(ActualDailyAverageSensor(coordinator, entry, account))
 
         fpl_accounts.append(FplDailyUsageSensor(coordinator, entry, account))
+        fpl_accounts.append(FplDailyUsageKWHSensor(coordinator, entry, account))
 
         # date sensors
         fpl_accounts.append(CurrentBillDateSensor(coordinator, entry, account))
diff --git a/custom_components/fpl/sensor_DailyUsageSensor.py b/custom_components/fpl/sensor_DailyUsageSensor.py
index 812ca27..299188e 100644
--- a/custom_components/fpl/sensor_DailyUsageSensor.py
+++ b/custom_components/fpl/sensor_DailyUsageSensor.py
@@ -19,7 +19,34 @@ class FplDailyUsageSensor(FplEntity):
         data = self.getData("daily_usage")
 
         if len(data) > 0:
-            return {"date": data[-1]["date"], "daily_usage": data}
+            return {"date": data[-1]["date"]}
+
+        return {}
+
+    @property
+    def icon(self):
+        return "mdi:currency-usd"
+
+
+class FplDailyUsageKWHSensor(FplEntity):
+    def __init__(self, coordinator, config, account):
+        super().__init__(coordinator, config, account, "Daily Usage KWH")
+
+    @property
+    def state(self):
+        data = self.getData("daily_usage")
+
+        if len(data) > 0:
+            return data[-1]["usage"]
+
+        return None
+
+    def defineAttributes(self):
+        """Return the state attributes."""
+        data = self.getData("daily_usage")
+
+        if len(data) > 0:
+            return {"date": data[-1]["date"]}
 
         return {}