Add Naema 2 Micro 25 and map more entities

custom_components/cozytouch/__init__.py

@@ -1,12 +1,15 @@
 """The Atlantic Cozytouch integration."""
 from __future__ import annotations
 
+import voluptuous as vol
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+import homeassistant.helpers.config_validation as cv
 
 from . import hub
-from .const import DOMAIN
+from .const import CONF_DUMPJSON, DOMAIN
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -16,6 +19,12 @@
     Platform.CLIMATE,
 ]
 
+CONFIG_SCHEMA = vol.Schema(
+    {DOMAIN: vol.Schema({vol.Optional(CONF_DUMPJSON): cv.boolean})},
+    extra=vol.ALLOW_EXTRA,
+)
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Atlantic Cozytouch from a config entry."""
     theHub = hub.Hub(hass, entry.data["username"], entry.data["password"])

custom_components/cozytouch/capability.py

@@ -3,16 +3,6 @@
 
 def get_capability_infos(modelId: int, capabilityId: int) -> {}:
     """Get capabilities for a device."""
-    if modelId == 235:
-        return get_capability_infos_navilink(capabilityId)
-
-    return None
-
-
-def get_capability_infos_navilink(capabilityId: int) -> {}:
-    """Get capabilities for a Navilink device."""
-    modelId = 235
-
     if capabilityId == 7:
         return {
             "modelId": modelId,
@@ -30,6 +20,38 @@ def get_capability_infos_navilink(capabilityId: int) -> {}:
             "type": "temperature",
             "category": "sensor",
         }
+    elif capabilityId == 25:
+        return {
+            "modelId": modelId,
+            "name": "Number of starts CH pump",
+            "type": "int",
+            "category": "diag",
+            "icon": "mdi:water-pump",
+        }
+    elif capabilityId == 26:
+        return {
+            "modelId": modelId,
+            "name": "Number of starts DHW pump",
+            "type": "int",
+            "category": "diag",
+            "icon": "mdi:water-pump",
+        }
+    elif capabilityId == 28:
+        return {
+            "modelId": modelId,
+            "name": "Number of hours CH pump",
+            "type": "int",
+            "category": "diag",
+            "icon": "mdi:water-pump",
+        }
+    elif capabilityId == 29:
+        return {
+            "modelId": modelId,
+            "name": "Number of hours DHW pump",
+            "type": "int",
+            "category": "diag",
+            "icon": "mdi:water-pump",
+        }
     elif capabilityId == 40:
         return {
             "modelId": modelId,
@@ -95,6 +117,14 @@ def get_capability_infos_navilink(capabilityId: int) -> {}:
             "value_off": "0",
             "value_on": "2",
         }
+    elif capabilityId == 153:
+        return {
+            "modelId": modelId,
+            "name": "Flame",
+            "type": "binary",
+            "category": "sensor",
+            "icon": "mdi:fire",
+        }
     elif capabilityId == 154:
         return {
             "modelId": modelId,
@@ -106,14 +136,6 @@ def get_capability_infos_navilink(capabilityId: int) -> {}:
     elif capabilityId in (160, 161):
         # Target temperature adjustment limits
         return {}
-    elif capabilityId == 184:
-        return {
-            "modelId": modelId,
-            "name": "Time Control",
-            "type": "switch",
-            "category": "sensor",
-            "icon": "mdi:clock-outline",
-        }
     elif capabilityId == 172:
         return {
             "modelId": modelId,
@@ -123,6 +145,14 @@ def get_capability_infos_navilink(capabilityId: int) -> {}:
             "lowestValueCapabilityId": 160,
             "highestValueCapabilityId": 161,
         }
+    elif capabilityId == 184:
+        return {
+            "modelId": modelId,
+            "name": "Time Control",
+            "type": "switch",
+            "category": "sensor",
+            "icon": "mdi:clock-outline",
+        }
     elif capabilityId == 219:
         return {
             "modelId": modelId,
@@ -150,5 +180,21 @@ def get_capability_infos_navilink(capabilityId: int) -> {}:
             "category": "diag",
             "icon": "mdi:tag",
         }
+    elif capabilityId == 100402:
+        return {
+            "modelId": modelId,
+            "name": "Number of hours burner",
+            "type": "int",
+            "category": "diag",
+            "icon": "mdi:fire",
+        }
+    elif capabilityId == 100406:
+        return {
+            "modelId": modelId,
+            "name": "Number of starts burner",
+            "type": "int",
+            "category": "diag",
+            "icon": "mdi:fire",
+        }
 
     return None

custom_components/cozytouch/const.py

@@ -6,3 +6,5 @@
 COZYTOUCH_CLIENT_ID = (
     "Q3RfMUpWeVRtSUxYOEllZkE3YVVOQmpGblpVYToyRWNORHpfZHkzNDJVSnFvMlo3cFNKTnZVdjBh"
 )
+
+CONF_DUMPJSON = "dumpJSON"

custom_components/cozytouch/manifest.json

@@ -5,6 +5,5 @@
     "config_flow": true,
     "documentation": "https://github.com/gduteil/cozytouch",
     "iot_class": "cloud_polling",
-    "issue_tracker": "https://github.com/gduteil/cozytouch/issues",
     "version": "0.1.0"
-  }
+  }

custom_components/cozytouch/model.py

@@ -3,7 +3,9 @@
 
 def get_model_name_from_id(modelId: int) -> str:
     """Return name from model ID."""
-    if modelId == 235:
-        return "Navilink 128 Radio-Connect"
+    if modelId == 56:
+        return "Naema 2 Micro 25"
+    elif modelId == 235:
+        return "Thermostat Navilink Connect"
 
     return "Unknown product (" + str(modelId) + ")"

custom_components/cozytouch/sensor.py

@@ -53,7 +53,8 @@ async def async_setup_entry(
         if "icon" in capability:
             icon = capability["icon"]
 
-        if capability["type"] == "string":
+        if capability["type"] in ("string", "int"):
+            # Use a RegularStrSensor for integers
             sensors.append(
                 RegularStrSensor(
                     deviceId=capability["deviceId"],
@@ -134,7 +135,7 @@ async def async_setup_entry(
                     timestamp_index=1,
                 )
             )
-        elif capability["type"] == "switch":
+        elif capability["type"] in ("switch", "binary"):
             value_off = "0"
             if "value_off" in capability:
                 value_off = capability["value_off"]