Merge pull request #315 from claudegel/fix-3.0

Fix for 3.0

Author: claudegel

custom_components.json

@@ -1,6 +1,6 @@
 {
     "neviweb130": {
-        "version": "3.0.0",
+        "version": "3.0.1",
         "local_location": "/custom_components/neviweb130/__init__.py",
         "remote_location": "https://github.com/claudegel/sinope-130/tree/master/custom_components/__init__.py",
         "visit_repo": "https://github.com/claudegel/sinope-130",

custom_components/neviweb130/__init__.py

@@ -115,8 +115,9 @@ def __init__(self, hass, config):
         network = config.get(CONF_NETWORK)
         network2 = config.get(CONF_NETWORK2)
         network3 = config.get(CONF_NETWORK3)
+        ignore_miwi = config.get(CONF_IGNORE_MIWI)
         self.neviweb130_client = Neviweb130Client(
-            hass, username, password, network, network2, network3
+            hass, username, password, network, network2, network3, ignore_miwi
         )
 
 
@@ -141,6 +142,7 @@ def __init__(
         network,
         network2,
         network3,
+        ignore_miwi,
         timeout=REQUESTS_TIMEOUT,
     ):
         """Initialize the client object."""
@@ -150,6 +152,7 @@ def __init__(
         self._network_name = network
         self._network_name2 = network2
         self._network_name3 = network3
+        self._ignore_miwi = ignore_miwi
         self._gateway_id = None
         self._gateway_id2 = None
         self._gateway_id3 = None
@@ -453,7 +456,7 @@ def __get_gateway_data(self):
                 device[ATTR_SIGNATURE] = data[ATTR_SIGNATURE]
             _LOGGER.debug("Received signature data: %s", data)
             if data[ATTR_SIGNATURE]["protocol"] == "miwi":
-                if not IGNORE_MIWI:
+                if not self._ignore_miwi:
                     _LOGGER.debug(
                         "The Neviweb location selected for parameter "
                         + "«network» contain unsupported device with protocol"
@@ -471,7 +474,7 @@ def __get_gateway_data(self):
                     device[ATTR_SIGNATURE] = data2[ATTR_SIGNATURE]
                 _LOGGER.debug("Received signature data: %s", data2)
                 if data2[ATTR_SIGNATURE]["protocol"] == "miwi":
-                    if not IGNORE_MIWI:
+                    if not self._ignore_miwi:
                         _LOGGER.debug(
                             "The Neviweb location selected for parameter "
                             + "«network2» contain unsupported device with protocol"
@@ -489,7 +492,7 @@ def __get_gateway_data(self):
                     device[ATTR_SIGNATURE] = data3[ATTR_SIGNATURE]
                 _LOGGER.debug("Received signature data: %s", data3)
                 if data3[ATTR_SIGNATURE]["protocol"] == "miwi":
-                    if not IGNORE_MIWI:
+                    if not self._ignore_miwi:
                         _LOGGER.debug(
                             "The Neviweb location selected for parameter "
                             + "«network3» contain unsupported device with protocol"

custom_components/neviweb130/manifest.json

@@ -7,6 +7,6 @@
   "dependencies": [],
   "requirements": [],
   "iot_class": "cloud_polling",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "homeassistant": "2024.12.1"
 }

custom_components/neviweb130/schema.py

@@ -37,17 +37,30 @@
 
 """Default parameters values."""
 
-VERSION = "3.0.0"
+VERSION = "3.0.1"
 SCAN_INTERVAL = timedelta(seconds=540)
 HOMEKIT_MODE = False
 STAT_INTERVAL = 1800
 IGNORE_MIWI = False
 NOTIFY = "both"
-PERIOD_VALUE = {"15 sec", "5 min", "10 min", "15 min", "20 min", "25 min", "30 min"}
+PERIOD_VALUE = {
+    "15 sec",
+    "5 min",
+    "10 min",
+    "15 min",
+    "20 min",
+    "25 min",
+    "30 min",
+}
 MIN_TIME = {120, 180, 240, 300, 600}
 WIFI_CYCLE = {600, 900, 1200, 1500}
 TANK_VALUE = {"40 gal", "50 gal", "60 gal", "80 gal"}
-CONTROLLED_VALUE = {"Hot water heater", "Pool pump", "Eletric vehicle charger", "Other"}
+CONTROLLED_VALUE = {
+    "Hot water heater",
+    "Pool pump",
+    "Eletric vehicle charger",
+    "Other",
+}
 FLOW_MODEL = {"FS4220", "FS4221", "No flow meter"}
 FLOW_DURATION = {
     "15 min",

custom_components/neviweb130/valve.py

@@ -324,7 +324,10 @@ def set_valve_alert_service(service):
         value = {}
         for switch in entities:
             if switch.entity_id == entity_id:
-                value = {"id": switch.unique_id, "batt": service.data[ATTR_BATT_ALERT]}
+                value = {
+                    "id": switch.unique_id,
+                    "batt": service.data[ATTR_BATT_ALERT],
+                }
                 switch.set_valve_alert(value)
                 switch.schedule_update_ha_state(True)
                 break
@@ -335,7 +338,10 @@ def set_valve_temp_alert_service(service):
         value = {}
         for switch in entities:
             if switch.entity_id == entity_id:
-                value = {"id": switch.unique_id, "temp": service.data[ATTR_TEMP_ALERT]}
+                value = {
+                    "id": switch.unique_id,
+                    "temp": service.data[ATTR_TEMP_ALERT],
+                }
                 switch.set_valve_temp_alert(value)
                 switch.schedule_update_ha_state(True)
                 break
@@ -403,7 +409,10 @@ def set_activation_service(service):
         value = {}
         for switch in entities:
             if switch.entity_id == entity_id:
-                value = {"id": switch.unique_id, "active": service.data[ATTR_ACTIVE]}
+                value = {
+                    "id": switch.unique_id,
+                    "active": service.data[ATTR_ACTIVE],
+                }
                 switch.set_activation(value)
                 switch.schedule_update_ha_state(True)
                 break
@@ -820,7 +829,7 @@ def do_stat(self, start):
                 and self._energy_stat_time != 0
             ):
                 device_hourly_stats = self._client.get_device_hourly_stats(self._id)
-                #                _LOGGER.warning("%s device_hourly_stats = %s", self._name, device_hourly_stats)
+                # _LOGGER.warning("%s device_hourly_stats = %s", self._name, device_hourly_stats)
                 if device_hourly_stats is not None and len(device_hourly_stats) > 1:
                     self._hour_energy_kwh_count = (
                         device_hourly_stats[1]["counter"] / 1000
@@ -831,7 +840,7 @@ def do_stat(self, start):
                     self._hour_kwh = 0
                     _LOGGER.warning("Got None for device_hourly_stats")
                 device_daily_stats = self._client.get_device_daily_stats(self._id)
-                #                _LOGGER.warning("%s device_daily_stats = %s", self._name, device_daily_stats)
+                # _LOGGER.warning("%s device_daily_stats = %s", self._name, device_daily_stats)
                 if device_daily_stats is not None and len(device_daily_stats) > 1:
                     self._today_energy_kwh_count = (
                         device_daily_stats[0]["counter"] / 1000
@@ -842,7 +851,7 @@ def do_stat(self, start):
                     self._today_kwh = 0
                     _LOGGER.warning("Got None for device_daily_stats")
                 device_monthly_stats = self._client.get_device_monthly_stats(self._id)
-                #                _LOGGER.warning("%s device_monthly_stats = %s", self._name, device_monthly_stats)
+                # _LOGGER.warning("%s device_monthly_stats = %s", self._name, device_monthly_stats)
                 if device_monthly_stats is not None and len(device_monthly_stats) > 1:
                     self._month_energy_kwh_count = (
                         device_monthly_stats[0]["counter"] / 1000
@@ -881,15 +890,18 @@ def log_error(self, error_data):
         elif error_data == "MAINTENANCE":
             _LOGGER.warning("Access blocked for maintenance...Retry later.")
             self.notify_ha(
-                "Warning: Neviweb access temporary blocked for maintenance...Retry later."
+                "Warning: Neviweb access temporary blocked for maintenance..."
+                + "Retry later."
             )
             self._client.reconnect()
         elif error_data == "ACCSESSEXC":
             _LOGGER.warning(
-                "Maximun session number reached...Close other connections and try again."
+                "Maximun session number reached...Close other connections "
+                + "and try again."
             )
             self.notify_ha(
-                "Warning: Maximun Neviweb session number reached...Close other connections and try again."
+                "Warning: Maximun Neviweb session number reached...Close "
+                + "other connections and try again."
             )
             self._client.reconnect()
         elif error_data == "DVCATTRNSPTD":
@@ -901,13 +913,16 @@ def log_error(self, error_data):
             )
         elif error_data == "DVCACTNSPTD":
             _LOGGER.warning(
-                "Device action not supported for %s...(SKU: %s) Report to maintainer.",
+                "Device action not supported for %s...(SKU: %s) Report to "
+                + "maintainer.",
                 self._name,
                 self._sku,
             )
         elif error_data == "DVCCOMMTO":
             _LOGGER.warning(
-                "Device Communication Timeout for %s... The device did not respond to the server within the prescribed delay. (SKU: %s)",
+                "Device Communication Timeout for %s... The device did not "
+                + "respond to the server within the prescribed delay. "
+                + "(SKU: %s)",
                 self._name,
                 self._sku,
             )
@@ -920,7 +935,8 @@ def log_error(self, error_data):
             )
         elif error_data == "DVCBUSY":
             _LOGGER.warning(
-                "Device busy can't reach (neviweb update ?), retry later %s: %s...(SKU: %s)",
+                "Device busy can't reach (neviweb update ?), retry later %s: %s..."
+                + "(SKU: %s)",
                 self._name,
                 error_data,
                 self._sku,
@@ -934,16 +950,21 @@ def log_error(self, error_data):
                     self._sku,
                 )
                 _LOGGER.warning(
-                    "This device %s is de-activated and won't be updated for 20 minutes.",
+                    "This device %s is de-activated and won't be updated for "
+                    + "20 minutes.",
                     self._name,
                 )
                 _LOGGER.warning(
-                    "You can re-activate device %s with service.neviweb130_set_activation or wait 20 minutes for update to restart or just restart HA.",
+                    "You can re-activate device %s with "
+                    + "service.neviweb130_set_activation or wait 20 minutes "
+                    + "for update to restart or just restart HA.",
                     self._name,
                 )
             if NOTIFY == "notification" or NOTIFY == "both":
                 self.notify_ha(
-                    "Warning: Received message from Neviweb, device disconnected... Check your log... Neviweb update will be halted for 20 minutes for "
+                    "Warning: Received message from Neviweb, device "
+                    + "disconnected... Check your log... Neviweb update will "
+                    + "be halted for 20 minutes for "
                     + self._name
                     + ", Sku: "
                     + self._sku
@@ -1094,7 +1115,10 @@ def update(self):
                     self._battery_alert = device_data[ATTR_BATT_ALERT]
                     if ATTR_WATER_LEAK_STATUS in device_data:
                         self._water_leak_status = device_data[ATTR_WATER_LEAK_STATUS]
-                        if self._water_leak_status == "flowMeter":
+                        if (
+                            self._water_leak_status == "flowMeter"
+                            and device_data[ATTR_FLOW_METER_CONFIG]["offset"] != 0
+                        ):
                             self.notify_ha(
                                 "Warning: Neviweb Device error detected: "
                                 + device_data[ATTR_WATER_LEAK_STATUS]
@@ -1399,7 +1423,10 @@ def update(self):
                         ]
                         self._flowmeter_model = model_to_HA(self._flowmeter_multiplier)
                     self._water_leak_status = device_data[ATTR_WATER_LEAK_STATUS]
-                    if self._water_leak_status == "flowMeter":
+                    if (
+                        self._water_leak_status == "flowMeter"
+                        and device_data[ATTR_FLOW_METER_CONFIG]["offset"] != 0
+                    ):
                         self.notify_ha(
                             "Warning: Neviweb Device error detected: "
                             + device_data[ATTR_WATER_LEAK_STATUS]
@@ -1657,7 +1684,10 @@ def update(self):
                         ]
                         self._flowmeter_model = model_to_HA(self._flowmeter_multiplier)
                     self._water_leak_status = device_data[ATTR_WATER_LEAK_STATUS]
-                    if self._water_leak_status == "flowMeter":
+                    if (
+                        self._water_leak_status == "flowMeter"
+                        and device_data[ATTR_FLOW_METER_CONFIG]["offset"] != 0
+                    ):
                         self.notify_ha(
                             "Warning: Neviweb Device error detected: "
                             + device_data[ATTR_WATER_LEAK_STATUS]