Revert "Merge pull request #436 from plugwise/elga-bug"

This reverts commit 7d960e5, reversing
changes made to 69e66fa.

Author: bouwew

CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## v0.34.1
-
-- Anna+Elga now always has `cooling_present` set to `True`: the Elga (always) has cooling-capability.
-- Cooling-mode on/off is determined from specific Elga status-codes
-
 ## v0.34.0
 
 - New feature: for Adam, provide mode = off, related to the regulation_mode = off, and mode = cool, for regulation_mode = cooling.

fixtures/anna_elga_2/all_data.json

@@ -5,7 +5,6 @@
       "binary_sensors": {
         "compressor_state": false,
         "cooling_enabled": false,
-        "cooling_state": false,
         "dhw_state": false,
         "flame_state": false,
         "heating_state": false,
@@ -19,7 +18,7 @@
         "setpoint": 60.0,
         "upper_bound": 100.0
       },
-      "model": "Generic heater/cooler",
+      "model": "Generic heater",
       "name": "OpenTherm",
       "sensors": {
         "domestic_hot_water_setpoint": 60.0,
@@ -51,8 +50,7 @@
         "cooling_activation_outdoor_temperature": 26.0,
         "cooling_deactivation_threshold": 3.0,
         "illuminance": 0.5,
-        "setpoint_high": 30.0,
-        "setpoint_low": 19.5,
+        "setpoint": 19.5,
         "temperature": 20.9
       },
       "temperature_offset": {
@@ -64,8 +62,7 @@
       "thermostat": {
         "lower_bound": 4.0,
         "resolution": 0.1,
-        "setpoint_high": 30.0,
-        "setpoint_low": 19.5,
+        "setpoint": 19.5,
         "upper_bound": 30.0
       },
       "vendor": "Plugwise"
@@ -88,10 +85,10 @@
     }
   },
   "gateway": {
-    "cooling_present": true,
+    "cooling_present": false,
     "gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
     "heater_id": "573c152e7d4f4720878222bd75638f5b",
-    "item_count": 62,
+    "item_count": 59,
     "notifications": {},
     "smile_name": "Smile Anna"
   }

fixtures/anna_elga_2_schedule_off/all_data.json

@@ -5,7 +5,6 @@
       "binary_sensors": {
         "compressor_state": false,
         "cooling_enabled": false,
-        "cooling_state": false,
         "dhw_state": false,
         "flame_state": false,
         "heating_state": false,
@@ -19,7 +18,7 @@
         "setpoint": 60.0,
         "upper_bound": 100.0
       },
-      "model": "Generic heater/cooler",
+      "model": "Generic heater",
       "name": "OpenTherm",
       "sensors": {
         "domestic_hot_water_setpoint": 60.0,
@@ -42,7 +41,7 @@
       "firmware": "2018-02-08T11:15:53+01:00",
       "hardware": "6539-1301-5002",
       "location": "d3ce834534114348be628b61b26d9220",
-      "mode": "heat_cool",
+      "mode": "heat",
       "model": "ThermoTouch",
       "name": "Anna",
       "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
@@ -51,8 +50,7 @@
         "cooling_activation_outdoor_temperature": 26.0,
         "cooling_deactivation_threshold": 3.0,
         "illuminance": 0.5,
-        "setpoint_high": 30.0,
-        "setpoint_low": 19.5,
+        "setpoint": 19.5,
         "temperature": 20.9
       },
       "temperature_offset": {
@@ -64,8 +62,7 @@
       "thermostat": {
         "lower_bound": 4.0,
         "resolution": 0.1,
-        "setpoint_high": 30.0,
-        "setpoint_low": 19.5,
+        "setpoint": 19.5,
         "upper_bound": 30.0
       },
       "vendor": "Plugwise"
@@ -88,10 +85,10 @@
     }
   },
   "gateway": {
-    "cooling_present": true,
+    "cooling_present": false,
     "gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
     "heater_id": "573c152e7d4f4720878222bd75638f5b",
-    "item_count": 62,
+    "item_count": 59,
     "notifications": {},
     "smile_name": "Smile Anna"
   }

fixtures/anna_heatpump_heating/all_data.json

@@ -21,7 +21,6 @@
       "binary_sensors": {
         "compressor_state": true,
         "cooling_enabled": false,
-        "cooling_state": false,
         "dhw_state": false,
         "flame_state": false,
         "heating_state": true,
@@ -41,7 +40,7 @@
         "setpoint": 60.0,
         "upper_bound": 100.0
       },
-      "model": "Generic heater/cooler",
+      "model": "Generic heater",
       "name": "OpenTherm",
       "sensors": {
         "dhw_temperature": 46.3,
@@ -73,8 +72,7 @@
         "cooling_activation_outdoor_temperature": 21.0,
         "cooling_deactivation_threshold": 4.0,
         "illuminance": 86.0,
-        "setpoint_high": 30.0,
-        "setpoint_low": 20.5,
+        "setpoint": 20.5,
         "temperature": 19.3
       },
       "temperature_offset": {
@@ -86,18 +84,17 @@
       "thermostat": {
         "lower_bound": 4.0,
         "resolution": 0.1,
-        "setpoint_high": 30.0,
-        "setpoint_low": 20.5,
+        "setpoint": 20.5,
         "upper_bound": 30.0
       },
       "vendor": "Plugwise"
     }
   },
   "gateway": {
-    "cooling_present": true,
+    "cooling_present": false,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
-    "item_count": 66,
+    "item_count": 63,
     "notifications": {},
     "smile_name": "Smile Anna"
   }

fixtures/m_anna_heatpump_cooling/all_data.json

@@ -73,7 +73,7 @@
         "cooling_activation_outdoor_temperature": 21.0,
         "cooling_deactivation_threshold": 4.0,
         "illuminance": 86.0,
-        "setpoint_high": 30.0,
+        "setpoint_high": 24.0,
         "setpoint_low": 20.5,
         "temperature": 26.3
       },
@@ -86,7 +86,7 @@
       "thermostat": {
         "lower_bound": 4.0,
         "resolution": 0.1,
-        "setpoint_high": 30.0,
+        "setpoint_high": 24.0,
         "setpoint_low": 20.5,
         "upper_bound": 30.0
       },
@@ -97,7 +97,7 @@
     "cooling_present": true,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
-    "item_count": 66,
+    "item_count": 63,
     "notifications": {},
     "smile_name": "Smile Anna"
   }

fixtures/m_anna_heatpump_idle/all_data.json

@@ -73,7 +73,7 @@
         "cooling_activation_outdoor_temperature": 25.0,
         "cooling_deactivation_threshold": 4.0,
         "illuminance": 86.0,
-        "setpoint_high": 30.0,
+        "setpoint_high": 24.0,
         "setpoint_low": 20.5,
         "temperature": 23.0
       },
@@ -86,7 +86,7 @@
       "thermostat": {
         "lower_bound": 4.0,
         "resolution": 0.1,
-        "setpoint_high": 30.0,
+        "setpoint_high": 24.0,
         "setpoint_low": 20.5,
         "upper_bound": 30.0
       },
@@ -97,7 +97,7 @@
     "cooling_present": true,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
-    "item_count": 66,
+    "item_count": 63,
     "notifications": {},
     "smile_name": "Smile Anna"
   }

plugwise/helper.py

@@ -1027,13 +1027,16 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData:
         if self._is_thermostat and self.smile(ANNA) and dev_id == self._heater_id:
             # Anna+Elga: base cooling_state on the elga-status-code
             if "elga_status_code" in data:
-                # Techneco Elga has cooling-capability
-                self._cooling_present = True
-                data["model"] = "Generic heater/cooler"
-                self._cooling_enabled = data["elga_status_code"] in [8, 9]
-                data["binary_sensors"]["cooling_state"] = self._cooling_active = (
-                    data["elga_status_code"] == 8
-                )
+                # Determine _cooling_present and _cooling_enabled
+                if (
+                    "cooling_enabled" in data["binary_sensors"]
+                    and data["binary_sensors"]["cooling_enabled"]
+                ):
+                    self._cooling_present = self._cooling_enabled = True
+                    data["model"] = "Generic heater/cooler"
+                    data["binary_sensors"]["cooling_state"] = self._cooling_active = (
+                        data["elga_status_code"] == 8
+                    )
                 data.pop("elga_status_code", None)
                 self._count -= 1
                 # Elga has no cooling-switch

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.34.1"
+version         = "0.34.0"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

scripts/manual_fixtures.py

@@ -282,13 +282,19 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
 ] = 28.2
 
 # Go for 3cb7
+m_anna_heatpump_cooling["devices"]["3cb70739631c4d17a86b8b12e8a5161b"][
+    "thermostat"
+].pop("setpoint")
 m_anna_heatpump_cooling["devices"]["3cb70739631c4d17a86b8b12e8a5161b"]["thermostat"][
     "setpoint_low"
 ] = 20.5
 m_anna_heatpump_cooling["devices"]["3cb70739631c4d17a86b8b12e8a5161b"]["thermostat"][
     "setpoint_high"
-] = 30.0
+] = 24.0
 
+m_anna_heatpump_cooling["devices"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"].pop(
+    "setpoint"
+)
 m_anna_heatpump_cooling["devices"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "temperature"
 ] = 26.3
@@ -297,7 +303,7 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
 ] = 20.5
 m_anna_heatpump_cooling["devices"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "setpoint_high"
-] = 30.0
+] = 24.0
 
 json_writer("m_anna_heatpump_cooling", m_anna_heatpump_cooling, base_n)