Merge pull request #88 from plugwise/fix_#87

Implement support for the Plugwise Jip

Author: bouwew

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.10.0"
+__version__ = "0.11.0"
 
 from plugwise.smile import Smile
 from plugwise.stick import stick

plugwise/constants.py

@@ -202,6 +202,7 @@
     "120006": "Sense Legrand",
     "070051": "Switch",
     "080029": "Switch",
+    "168-01": "Jip",
     "160-01": "Plug",
     "106-03": "Tom/Floor",
     "158-01": "Lisa",
@@ -362,6 +363,7 @@
 SWITCH_GROUP_TYPES = ["switching", "report"]
 THERMOSTAT_CLASSES = [
     "thermostat",
+    "zone_thermometer",
     "zone_thermostat",
     "thermostatic_radiator_valve",
 ]
@@ -404,6 +406,8 @@
     "battery": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
     "temperature_difference": {ATTR_UNIT_OF_MEASUREMENT: DEGREE},
     "valve_position": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
+    # Jip
+    "humidity": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
     # Plug
     "electricity_consumed": {ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
     "electricity_produced": {ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
@@ -743,6 +747,15 @@
     ATTR_ICON: FLAME_ICON,
     ATTR_UNIT_OF_MEASUREMENT: VOLUME_CUBIC_METERS,
 }
+HUMIDITY = {
+    ATTR_ID: "humidity",
+    ATTR_ENABLED: True,
+    ATTR_NAME: "Relative Humidity",
+    ATTR_STATE: None,
+    ATTR_DEVICE_CLASS: "humidity",
+    ATTR_ICON: None,
+    ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE,
+}
 ILLUMINANCE = {
     ATTR_ID: "illuminance",
     ATTR_ENABLED: True,
@@ -873,6 +886,7 @@
     EL_PRODUCED_PEAK_POINT,
     GAS_CONSUMED_CUMULATIVE,
     GAS_CONSUMED_INTERVAL,
+    HUMIDITY,
     ILLUMINANCE,
     INTENDED_BOILER_TEMP,
     MOD_LEVEL,

plugwise/helper.py

@@ -485,6 +485,12 @@ def all_appliances(self):
                 "types": appl.types,
                 "vendor": appl.v_name,
             }
+            if (
+                not self._smile_legacy
+                and appl.pwclass == "thermostat"
+                and appl.location is None
+            ):
+                self.appl_data.pop(appl.id)
 
         # For legacy Anna gateway and heater_central is the same device
         if self._smile_legacy and self.smile_type == "thermostat":
@@ -701,6 +707,7 @@ def scan_thermostats(self, debug_text="missing text"):
 
         thermo_matching = {
             "thermostat": 3,
+            "zone_thermometer": 2,
             "zone_thermostat": 2,
             "thermostatic_radiator_valve": 1,
         }

plugwise/util.py

@@ -97,8 +97,9 @@ def format_measure(measure, unit):
     try:
         measure = int(measure)
     except ValueError:
-        if unit == PERCENTAGE and float(measure) > 0:
-            return int(float(measure) * 100)
+        if unit == PERCENTAGE:
+            if 0 < float(measure) <= 1:
+                return int(float(measure) * 100)
 
         if unit == ENERGY_KILO_WATT_HOUR:
             measure = float(measure) / 1000

tests/test_smile.py

@@ -400,7 +400,9 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
         _LOGGER.info("Asserting testdata:")
         MASTER_THERMOSTATS = [
             "thermostat",
+            "zone_thermometer",
             "zone_thermostat",
+            "thermostatic_radiator_valve",
         ]
         bsw_lists = ["binary_sensors", "sensors", "switches"]
         smile.get_all_devices()
@@ -1470,6 +1472,32 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         await smile.close_connection()
         await self.disconnect(server, client)
 
+    @pytest.mark.asyncio
+    async def test_adam_plus_jip(self):
+        """Test Adam with Jip."""
+        testdata = {
+            # Woonkamer - Tom
+            "833de10f269c4deab58fb9df69901b4e": {
+                "sensors": [
+                    {"id": "valve_position", "state": 100},
+                ],
+            },
+            # Woonkamer - Jip
+            "f61f1a2535f54f52ad006a3d18e459ca": {
+                "sensors": [
+                    {"id": "humidity", "state": 56.2},
+                ],
+            },
+        }
+
+        self.smile_setup = "adam_jip"
+        server, smile, client = await self.connect_wrapper()
+
+        await self.device_test(smile, testdata)
+
+        await smile.close_connection()
+        await self.disconnect(server, client)
+
     @pytest.mark.asyncio
     async def test_connect_p1v3(self):
         """Test a P1 firmware 3 with only electricity setup."""