Merge pull request #2 from trizmark/expose-libbi-energy-data

Expose libbi energy data
trizmark · Sep 22, 2023 · f7275d2 · f7275d2
2 parents 1360083 + 6b94b98
commit f7275d2
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 10 deletions.
diff --git a/custom_components/myenergi/const.py b/custom_components/myenergi/const.py
@@ -3,7 +3,7 @@
 NAME = "myenergi"
 DOMAIN = "myenergi"
 DOMAIN_DATA = f"{DOMAIN}_data"
-VERSION = "0.0.23"
+VERSION = "0.0.24"
 
 ATTRIBUTION = "Data provided by myenergi"
 ISSUE_URL = "https://github.com/CJNE/ha-myenergi/issues"

diff --git a/custom_components/myenergi/manifest.json b/custom_components/myenergi/manifest.json
@@ -7,6 +7,6 @@
   "documentation": "https://github.com/cjne/ha-myenergi",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/cjne/ha-myenergi/issues",
-  "requirements": ["pymyenergi==0.0.28"],
+  "requirements": ["pymyenergi==0.0.29"],
   "version": "0.0.24"
 }
diff --git a/custom_components/myenergi/sensor.py b/custom_components/myenergi/sensor.py
@@ -501,7 +501,6 @@ async def async_setup_entry(hass, entry, async_add_devices):
                         "state_of_charge",
                         DEVICE_CLASS_BATTERY,
                         PERCENTAGE,
-                        ENTITY_CATEGORY_DIAGNOSTIC,
                     ),
                 )
             )
@@ -567,15 +566,18 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     )
                 )
             )
-            """ expose this temporarily (it's mapped to operating mode)"""
             sensors.append(
                 MyenergiSensor(
                     coordinator,
                     device,
                     entry,
                     create_meta(
-                        f"Local mode",
-                        "local_mode",
+                        f"Status",
+                        "status",
+                        None,
+                        None,
+                        None,
+                        ICON_HOME_BATTERY,
                     )
                 )
             )
@@ -585,12 +587,77 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Status",
-                        "status",
+                        f"Grid import today",
+                        "grid_import",
+                        DEVICE_CLASS_ENERGY,
+                        ENERGY_KILO_WATT_HOUR,
                         None,
                         None,
+                        STATE_CLASS_TOTAL_INCREASING,
+                    )
+                )
+            )
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta(
+                        f"Grid export today",
+                        "grid_export",
+                        DEVICE_CLASS_ENERGY,
+                        ENERGY_KILO_WATT_HOUR,
                         None,
-                        ICON_HOME_BATTERY,
+                        None,
+                        STATE_CLASS_TOTAL_INCREASING,
+                    )
+                )
+            )
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta(
+                        f"Battery charge today",
+                        "battery_charge",
+                        DEVICE_CLASS_ENERGY,
+                        ENERGY_KILO_WATT_HOUR,
+                        None,
+                        None,
+                        STATE_CLASS_TOTAL_INCREASING,
+                    )
+                )
+            )
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta(
+                        f"Battery discharge today",
+                        "battery_discharge",
+                        DEVICE_CLASS_ENERGY,
+                        ENERGY_KILO_WATT_HOUR,
+                        None,
+                        None,
+                        STATE_CLASS_TOTAL_INCREASING,
+                    )
+                )
+            )
+            sensors.append(
+                MyenergiSensor(
+                    coordinator,
+                    device,
+                    entry,
+                    create_meta(
+                        f"Solar generation today",
+                        "generated",
+                        DEVICE_CLASS_ENERGY,
+                        ENERGY_KILO_WATT_HOUR,
+                        None,
+                        None,
+                        STATE_CLASS_TOTAL_INCREASING,
                     )
                 )
             )
@@ -606,7 +673,7 @@ def __init__(self, coordinator, config_entry, meta):
     @property
     def unique_id(self):
         """Return a unique ID to use for this entity."""
-        return f"{self.config_entry.entry_id}-{self.coordinator.client.serial_number}-{self.meta['prop_name']}"
+        return f"{self.config_entry.entry_id}-hub-{self.coordinator.client.serial_number}-{self.meta['prop_name']}"
 
     @property
     def name(self):