Fixed kiosk

tijsverkoyen · Oct 25, 2022 · 2561be5 · 2561be5
1 parent 3ebfbbc
commit 2561be5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/custom_components/fusion_solar/fusion_solar/energy_sensor.py b/custom_components/fusion_solar/fusion_solar/energy_sensor.py
@@ -27,7 +27,7 @@ def __init__(
             name,
             attribute,
             data_name,
-            device_info
+            device_info=None
     ):
         """Initialize the entity"""
         super().__init__(coordinator)

diff --git a/custom_components/fusion_solar/fusion_solar/power_entity.py b/custom_components/fusion_solar/fusion_solar/power_entity.py
@@ -13,7 +13,7 @@ def __init__(
             name,
             attribute,
             data_name,
-            device_info
+            device_info=None
     ):
         """Initialize the entity"""
         super().__init__(coordinator)

diff --git a/custom_components/fusion_solar/sensor.py b/custom_components/fusion_solar/sensor.py
@@ -52,9 +52,12 @@ async def async_update_kiosk_data():
         """Fetch data"""
         data = {}
         api = FusionSolarKioskApi(kiosk.apiUrl())
-        data[f'{DOMAIN}-{kiosk.id}'] = {
-            await hass.async_add_executor_job(api.getRealTimeKpi, kiosk.id)
-        }
+
+        _LOGGER.debug(DOMAIN)
+        _LOGGER.debug(kiosk.id)
+
+        data[f'{DOMAIN}-{kiosk.id}'] = await hass.async_add_executor_job(api.getRealTimeKpi, kiosk.id)
+
         return data
 
     coordinator = DataUpdateCoordinator(
@@ -68,13 +71,23 @@ async def async_update_kiosk_data():
     # Fetch initial data so we have data when entities subscribe
     await coordinator.async_refresh()
 
+    device_info = {
+        'identifiers': {
+            (DOMAIN, kiosk.id)
+        },
+        'name': kiosk.name,
+        'manufacturer': 'Huawei FusionSolar',
+        'model': 'Kiosk'
+    }
+
     async_add_entities([
         FusionSolarPowerEntityRealtime(
             coordinator,
             f'{DOMAIN}-{kiosk.id}-{ID_REALTIME_POWER}',
             f'{kiosk.name} ({kiosk.id}) - {NAME_REALTIME_POWER}',
             ATTR_REALTIME_POWER,
             f'{DOMAIN}-{kiosk.id}',
+            device_info
         ),
 
         FusionSolarEnergySensorTotalCurrentDay(
@@ -83,27 +96,31 @@ async def async_update_kiosk_data():
             f'{kiosk.name} ({kiosk.id}) - {NAME_TOTAL_CURRENT_DAY_ENERGY}',
             ATTR_TOTAL_CURRENT_DAY_ENERGY,
             f'{DOMAIN}-{kiosk.id}',
+            device_info
         ),
         FusionSolarEnergySensorTotalCurrentMonth(
             coordinator,
             f'{DOMAIN}-{kiosk.id}-{ID_TOTAL_CURRENT_MONTH_ENERGY}',
             f'{kiosk.name} ({kiosk.id}) - {NAME_TOTAL_CURRENT_MONTH_ENERGY}',
             ATTR_TOTAL_CURRENT_MONTH_ENERGY,
             f'{DOMAIN}-{kiosk.id}',
+            device_info
         ),
         FusionSolarEnergySensorTotalCurrentYear(
             coordinator,
             f'{DOMAIN}-{kiosk.id}-{ID_TOTAL_CURRENT_YEAR_ENERGY}',
             f'{kiosk.name} ({kiosk.id}) - {NAME_TOTAL_CURRENT_YEAR_ENERGY}',
             ATTR_TOTAL_CURRENT_YEAR_ENERGY,
             f'{DOMAIN}-{kiosk.id}',
+            device_info
         ),
         FusionSolarEnergySensorTotalLifetime(
             coordinator,
             f'{DOMAIN}-{kiosk.id}-{ID_TOTAL_LIFETIME_ENERGY}',
             f'{kiosk.name} ({kiosk.id}) - {NAME_TOTAL_LIFETIME_ENERGY}',
             ATTR_TOTAL_LIFETIME_ENERGY,
             f'{DOMAIN}-{kiosk.id}',
+            device_info
         )
     ])