Merge pull request #549 from plugwise/pauze

Implement feature request #523, fix Core Issue #104433

Author: bouwew

CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## Versions from 0.40 and up
 
-## Ongoing
+## v0.46.0
 
+- New Feature: for Adam, add the gateway_mode Select. This allows the user to set the Gateway Mode, options: Normal, Pause, Vacation.
+  Implemented via [plugwise v0.36.1](https://github.com/plugwise/python-plugwise/releases/tag/v0.36.1)
+- Remove support for Adam with fw 2.x and Anna with fw 3.x, via [plugwise v0.35.4](https://github.com/plugwise/python-plugwise/releases/tag/v0.35.4).
+- Fix [Core Issue #104433](https://github.com/home-assistant/core/issues/104433) via [plugwise v0.35.3](https://github.com/plugwise/python-plugwise/releases/tag/v0.35.3)
 - Implement [Core PR #104004](https://github.com/home-assistant/core/pull/104004)
 - Implement [Core PR #104324](https://github.com/home-assistant/core/pull/104324)
 

custom_components/plugwise/const.py

@@ -72,11 +72,13 @@
 
 SelectType = Literal[
     "select_dhw_mode",
+    "select_gateway_mode",
     "select_regulation_mode",
     "select_schedule",
 ]
 SelectOptionsType = Literal[
     "dhw_modes",
+    "gateway_modes",
     "regulation_modes",
     "available_schedules",
 ]

custom_components/plugwise/manifest.json

@@ -8,6 +8,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==0.35.3"],
-  "version": "0.45.1"
+  "requirements": ["plugwise==0.36.1"],
+  "version": "0.46.0"
 }

custom_components/plugwise/select.py

@@ -50,6 +50,14 @@ class PlugwiseSelectEntityDescription(SelectEntityDescription):
         command=lambda api, loc, opt: api.set_regulation_mode(opt),
         options_key="regulation_modes",
     ),
+    PlugwiseSelectEntityDescription(
+        key="select_gateway_mode",
+        translation_key="gateway_mode",
+        icon="mdi:cog-outline",
+        entity_category=EntityCategory.CONFIG,
+        command=lambda api, loc, opt: api.set_gateway_mode(opt),
+        options_key="gateway_modes",
+    ),
     PlugwiseSelectEntityDescription(
         key="select_dhw_mode",
         translation_key="dhw_mode",

custom_components/plugwise/strings.json

@@ -118,6 +118,14 @@
           "off": "Off"
         }
       },
+      "gateway_mode": {
+        "name": "Gateway mode",
+        "state": {
+          "away": "Pause",
+          "full": "Normal",
+          "vacation": "Vacation"
+        }
+      },
       "thermostat_schedule": {
         "name": "Thermostat schedule",
         "state": {

custom_components/plugwise/translations/en.json

@@ -118,6 +118,14 @@
           "off": "Off"
         }
       },
+      "gateway_mode": {
+        "name": "Gateway mode",
+        "state": {
+          "away": "Pause",
+          "full": "Normal",
+          "vacation": "Vacation"
+        }
+      },
       "thermostat_schedule": {
         "name": "Thermostat schedule",
         "state": {

custom_components/plugwise/translations/nl.json

@@ -118,6 +118,14 @@
           "off": "Uit"
         }
       },
+      "gateway_mode": {
+        "name": "Gateway mode",
+        "state": {
+          "away": "Pauze",
+          "full": "Normaal",
+          "vacation": "Vakantie"
+        }
+      },
       "thermostat_schedule": {
         "name": "Thermostaatschema",
         "state": {

tests/components/plugwise/conftest.py

@@ -162,7 +162,7 @@ def mock_smile_adam_3() -> Generator[None, MagicMock, None]:
 @pytest.fixture
 def mock_smile_adam_4() -> Generator[None, MagicMock, None]:
     """Create a 4th Mock Adam environment for testing exceptions."""
-    chosen_env = "adam_jip"
+    chosen_env = "m_adam_jip"
 
     with patch(
         "homeassistant.components.plugwise.coordinator.Smile", autospec=True

tests/components/plugwise/fixtures/m_adam_cooling/all_data.json

@@ -5,15 +5,15 @@
       "binary_sensors": {
         "cooling_state": true,
         "dhw_state": false,
-        "flame_state": false,
+        "flame_state": true,
         "heating_state": false
       },
       "dev_class": "heater_central",
       "location": "bc93488efab249e5bc54fd7e175a6f91",
       "maximum_boiler_temperature": {
         "lower_bound": 25.0,
         "resolution": 0.01,
-        "setpoint": 60.0,
+        "setpoint": 50.0,
         "upper_bound": 95.0
       },
       "model": "Generic heater",
@@ -37,8 +37,8 @@
       "sensors": {
         "battery": 99,
         "temperature": 21.6,
-        "temperature_difference": 2.3,
-        "valve_position": 0.0
+        "temperature_difference": -0.2,
+        "valve_position": 100
       },
       "temperature_offset": {
         "lower_bound": -2.0,
@@ -47,19 +47,25 @@
         "upper_bound": 2.0
       },
       "vendor": "Plugwise",
-      "zigbee_mac_address": "ABCD012345670A01"
+      "zigbee_mac_address": "000D6F000C8FF5EE"
     },
     "ad4838d7d35c4d6ea796ee12ae5aedf8": {
-      "active_preset": "asleep",
+      "active_preset": "home",
       "available": true,
-      "available_schedules": ["Weekschema", "Badkamer", "Test", "off"],
+      "available_schedules": [
+        "Badkamer",
+        "Test",
+        "Vakantie",
+        "Weekschema",
+        "off"
+      ],
       "control_state": "cooling",
       "dev_class": "thermostat",
       "location": "f2bf9048bef64cc5b6d5110154e33c81",
       "mode": "cool",
       "model": "ThermoTouch",
       "name": "Anna",
-      "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+      "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
       "select_schedule": "Weekschema",
       "selected_schedule": "None",
       "sensors": {
@@ -79,42 +85,50 @@
         "plugwise_notification": false
       },
       "dev_class": "gateway",
-      "firmware": "3.6.4",
+      "firmware": "3.7.8",
+      "gateway_modes": ["away", "full", "vacation"],
       "hardware": "AME Smile 2.0 board",
       "location": "bc93488efab249e5bc54fd7e175a6f91",
-      "mac_address": "012345670001",
+      "mac_address": "012345679891",
       "model": "Gateway",
       "name": "Adam",
       "regulation_modes": [
-        "heating",
-        "off",
-        "bleeding_cold",
         "bleeding_hot",
+        "bleeding_cold",
+        "off",
+        "heating",
         "cooling"
       ],
+      "select_gateway_mode": "full",
       "select_regulation_mode": "cooling",
       "sensors": {
         "outdoor_temperature": 29.65
       },
       "vendor": "Plugwise",
-      "zigbee_mac_address": "ABCD012345670101"
+      "zigbee_mac_address": "000D6F000D5A168D"
     },
     "e2f4322d57924fa090fbbc48b3a140dc": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["Weekschema", "Badkamer", "Test", "off"],
-      "control_state": "off",
+      "available_schedules": [
+        "Badkamer",
+        "Test",
+        "Vakantie",
+        "Weekschema",
+        "off"
+      ],
+      "control_state": "preheating",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-10T02:00:00+02:00",
       "hardware": "255",
       "location": "f871b8c4d63549319221e294e4f88074",
       "mode": "auto",
       "model": "Lisa",
       "name": "Lisa Badkamer",
-      "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+      "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
       "select_schedule": "Badkamer",
       "sensors": {
-        "battery": 56,
+        "battery": 38,
         "setpoint": 23.5,
         "temperature": 23.9
       },
@@ -131,7 +145,7 @@
         "upper_bound": 99.9
       },
       "vendor": "Plugwise",
-      "zigbee_mac_address": "ABCD012345670A04"
+      "zigbee_mac_address": "000D6F000C869B61"
     },
     "e8ef2a01ed3b4139a53bf749204fe6b4": {
       "dev_class": "switching",
@@ -150,7 +164,7 @@
     "cooling_present": true,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
-    "item_count": 145,
+    "item_count": 147,
     "notifications": {},
     "smile_name": "Adam"
   }

tests/components/plugwise/fixtures/m_adam_cooling/device_list.json

@@ -1,8 +1,8 @@
 [
   "da224107914542988a88561b4452b0f6",
   "056ee145a816487eaa69243c3280f8bf",
+  "e2f4322d57924fa090fbbc48b3a140dc",
   "ad4838d7d35c4d6ea796ee12ae5aedf8",
   "1772a4ea304041adb83f357b751341ff",
-  "e2f4322d57924fa090fbbc48b3a140dc",
   "e8ef2a01ed3b4139a53bf749204fe6b4"
 ]