Add daily fee metrics

megakid · Jun 16, 2022 · 3204a3a · 3204a3a
1 parent b1f0136
commit 3204a3a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/custom_components/hildebrand_glow_ihd_mqtt/__init__.py b/custom_components/hildebrand_glow_ihd_mqtt/__init__.py
@@ -23,7 +23,6 @@ async def async_setup(hass: HomeAssistant, config: dict):
 
     return True
 
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     _LOGGER.debug("Setting up Hildebrand Glow IHD MQTT integration")
 
@@ -32,8 +31,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
 
     hass.data[DOMAIN][entry.entry_id][CONF_DEVICE_ID] = entry.data[CONF_DEVICE_ID].strip().upper().replace(":", "").replace(" ", "")
 
-
-
     for component in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(entry, component))

diff --git a/custom_components/hildebrand_glow_ihd_mqtt/sensor.py b/custom_components/hildebrand_glow_ihd_mqtt/sensor.py
@@ -79,7 +79,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.TOTAL_INCREASING,
-    #"value_template": "{{ value_json['electricitymeter']['energy']['export']['cumulative'] }}",
     "icon": "mdi:flash",
     "func": lambda js : js['electricitymeter']['energy']['export']['cumulative'],
   },
@@ -88,7 +87,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.TOTAL_INCREASING,
-    #"value_template": "{% if value_json['electricitymeter']['energy']['import']['cumulative'] == 0 %}\n  {{ states('sensor.smart_meter_electricity_import') }}\n{% else %}\n  {{ value_json['electricitymeter']['energy']['import']['cumulative'] }}\n{% endif %}\n",
     "icon": "mdi:flash",
     "func": lambda js : js['electricitymeter']['energy']['import']['cumulative'],
     "ignore_zero_values": True,
@@ -98,7 +96,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['electricitymeter']['energy']['import']['day'] }}",
     "icon": "mdi:flash",
     "func": lambda js : js['electricitymeter']['energy']['import']['day'],
   },
@@ -107,7 +104,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['electricitymeter']['energy']['import']['week'] }}",
     "icon": "mdi:flash",
     "func": lambda js : js['electricitymeter']['energy']['import']['week'],
   },
@@ -116,7 +112,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.MEASUREMENT,
-    # "value_template": "{{ value_json['electricitymeter']['energy']['import']['month'] }}",
     "icon": "mdi:flash",
     "func": lambda js : js['electricitymeter']['energy']['import']['month'],
   },
@@ -125,7 +120,6 @@
     "device_class": SensorDeviceClass.MONETARY,
     "unit_of_measurement": "GBP/kWh",
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['electricitymeter']['energy']['import']['price']['unitrate'] }}",
     "icon": "mdi:cash",
     "func": lambda js : js['electricitymeter']['energy']['import']['price']['unitrate'],
   },
@@ -134,7 +128,6 @@
     "device_class": SensorDeviceClass.MONETARY,
     "unit_of_measurement": "GBP",
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['electricitymeter']['energy']['import']['price']['standingcharge'] }}",
     "icon": "mdi:cash",
     "func": lambda js : js['electricitymeter']['energy']['import']['price']['standingcharge'],
   },
@@ -143,9 +136,17 @@
     "device_class": SensorDeviceClass.POWER,
     "unit_of_measurement": POWER_KILO_WATT,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['electricitymeter']['power']['value'] }}",
     "icon": "mdi:flash",
     "func": lambda js : js['electricitymeter']['power']['value'],
+  },
+  {
+    "name": "Smart Meter Electricity: Cost (Today)",
+    "device_class": SensorDeviceClass.MONETARY,
+    "unit_of_measurement": "GBP",
+    "state_class": SensorStateClass.MEASUREMENT,
+    "icon": "mdi:cash",
+    "func": lambda js : round(js['electricitymeter']['energy']['import']['price']['standingcharge'] + \
+       (js['electricitymeter']['energy']['import']['day'] * js['electricitymeter']['energy']['import']['price']['unitrate']), 2),
   }
 ]
 
@@ -155,7 +156,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.TOTAL_INCREASING,
-    #"value_template": "{% if value_json['gasmeter']['energy']['import']['cumulative'] == 0 %}\n  {{ states('sensor.smart_meter_gas_import') }}\n{% else %}\n  {{ value_json['gasmeter']['energy']['import']['cumulative'] }}\n{% endif %}\n",
     "icon": "mdi:fire",
     "func": lambda js : js['gasmeter']['energy']['import']['cumulative'],
     "ignore_zero_values": True,
@@ -165,7 +165,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['gasmeter']['energy']['import']['day'] }}",
     "icon": "mdi:fire",
     "func": lambda js : js['gasmeter']['energy']['import']['day']
   },
@@ -174,7 +173,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['gasmeter']['energy']['import']['week'] }}",
     "icon": "mdi:fire",
     "func": lambda js : js['gasmeter']['energy']['import']['week']
   },
@@ -183,7 +181,6 @@
     "device_class": SensorDeviceClass.ENERGY,
     "unit_of_measurement": ENERGY_KILO_WATT_HOUR,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['gasmeter']['energy']['import']['month'] }}",
     "icon": "mdi:fire",
     "func": lambda js : js['gasmeter']['energy']['import']['month']
   },
@@ -192,7 +189,6 @@
     "device_class": SensorDeviceClass.MONETARY,
     "unit_of_measurement": "GBP/kWh",
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['gasmeter']['energy']['import']['price']['unitrate'] }}",
     "icon": "mdi:cash",
     "func": lambda js : js['gasmeter']['energy']['import']['price']['unitrate']
   },
@@ -201,7 +197,6 @@
     "device_class": SensorDeviceClass.MONETARY,
     "unit_of_measurement": "GBP",
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['gasmeter']['energy']['import']['price']['standingcharge'] }}",
     "icon": "mdi:cash",
     "func": lambda js : js['gasmeter']['energy']['import']['price']['standingcharge']
   },
@@ -210,9 +205,17 @@
     "device_class": SensorDeviceClass.POWER,
     "unit_of_measurement": POWER_KILO_WATT,
     "state_class": SensorStateClass.MEASUREMENT,
-    #"value_template": "{{ value_json['gasmeter']['power']['value'] }}",
     "icon": "mdi:fire",
     "func": lambda js : js['gasmeter']['power']['value']
+  },
+  {
+    "name": "Smart Meter Gas: Cost (Today)",
+    "device_class": SensorDeviceClass.MONETARY,
+    "unit_of_measurement": "GBP",
+    "state_class": SensorStateClass.MEASUREMENT,
+    "icon": "mdi:cash",
+    "func": lambda js : round(js['gasmeter']['energy']['import']['price']['standingcharge'] + \
+       (js['gasmeter']['energy']['import']['day'] * js['gasmeter']['energy']['import']['price']['unitrate']), 2),
   }
 ]