Merge pull request #332 from jwillemsen/jwi-horizontalswing

Add support for separate horizontal/vertical swing modes

Author: jwillemsen

.github/workflows/constraints.txt

@@ -1,4 +1,4 @@
-pip==24.2
+pip==24.3.1
 pre-commit==3.6.2
 black==24.2.0
 flake8==7.0.0

.github/workflows/precommit.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Python
         uses: "actions/setup-python@v5"
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - name: Upgrade pip
         run: |
           pip install --constraint=.github/workflows/constraints.txt pip

.github/workflows/tests.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Python
         uses: "actions/setup-python@v5"
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - name: Install requirements
         run: |
           pip install --constraint=.github/workflows/constraints.txt pip

custom_components/daikin_onecta/climate.py

@@ -16,10 +16,6 @@
 from homeassistant.components.climate.const import PRESET_COMFORT
 from homeassistant.components.climate.const import PRESET_ECO
 from homeassistant.components.climate.const import PRESET_NONE
-from homeassistant.components.climate.const import SWING_BOTH
-from homeassistant.components.climate.const import SWING_HORIZONTAL
-from homeassistant.components.climate.const import SWING_OFF
-from homeassistant.components.climate.const import SWING_VERTICAL
 from homeassistant.const import ATTR_TEMPERATURE
 from homeassistant.const import CONF_HOST
 from homeassistant.const import CONF_NAME
@@ -31,10 +27,6 @@
 from .const import DAIKIN_DEVICES
 from .const import DOMAIN as DAIKIN_DOMAIN
 from .const import FANMODE_FIXED
-from .const import SWING_COMFORT
-from .const import SWING_COMFORT_HORIZONTAL
-from .const import SWING_FLOOR
-from .const import SWING_FLOOR_HORIZONTAL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -133,10 +125,12 @@ def update_state(self) -> None:
         self._attr_target_temperature = self.get_target_temperature()
         self._attr_hvac_modes = self.get_hvac_modes()
         self._attr_swing_modes = self.get_swing_modes()
+        self._attr_swing_horizontal_modes = self.get_swing_horizontal_modes()
         self._attr_preset_modes = self.get_preset_modes()
         self._attr_fan_modes = self.get_fan_modes()
         self._attr_hvac_mode = self.get_hvac_mode()
         self._attr_swing_mode = self.get_swing_mode()
+        self._attr_swing_horizontal_mode = self.get_swing_horizontal_mode()
         self._attr_preset_mode = self.get_preset_mode()
         self._attr_fan_mode = self.get_fan_mode()
         self._attr_device_info = self._device.device_info()
@@ -225,8 +219,12 @@ def get_supported_features(self):
             if operationmodedict is not None:
                 if operationmodedict.get("fanSpeed") is not None:
                     supported_features |= ClimateEntityFeature.FAN_MODE
-                if operationmodedict.get("fanDirection") is not None:
-                    supported_features |= ClimateEntityFeature.SWING_MODE
+                fan_direction = operationmodedict.get("fanDirection")
+                if fan_direction is not None:
+                    if fan_direction.get("vertical") is not None:
+                        supported_features |= ClimateEntityFeature.SWING_MODE
+                    if fan_direction.get("horizontal") is not None:
+                        supported_features |= ClimateEntityFeature.SWING_HORIZONTAL_MODE
 
         _LOGGER.info("Device '%s' supports features %s", self._device.name, supported_features)
 
@@ -558,90 +556,64 @@ async def async_set_fan_mode(self, fan_mode):
 
         return res
 
-    def get_swing_mode(self):
-        swingMode = None
+    def __get_swing_mode(self, direction):
+        swingMode = ""
         cc = self.climate_control()
         fanControl = cc.get("fanControl")
-        h = SWING_OFF
-        v = SWING_OFF
         if fanControl is not None:
-            swingMode = SWING_OFF
             operationmode = cc["operationMode"]["value"]
             operationmodedict = fanControl["value"]["operationModes"].get(operationmode)
             if operationmodedict is not None:
                 fan_direction = operationmodedict.get("fanDirection")
                 if fan_direction is not None:
-                    horizontal = fan_direction.get("horizontal")
-                    vertical = fan_direction.get("vertical")
-                    if horizontal is not None:
-                        h = horizontal["currentMode"]["value"]
-                    if vertical is not None:
-                        v = vertical["currentMode"]["value"]
-        if h == "swing":
-            swingMode = SWING_HORIZONTAL
-        if v == "swing":
-            swingMode = SWING_VERTICAL
-        if v == "swing" and h == "swing":
-            swingMode = SWING_BOTH
-        if v == "floorHeatingAirflow":
-            if h == "swing":
-                swingMode = SWING_FLOOR_HORIZONTAL
-            else:
-                swingMode = SWING_FLOOR
-        if v == "windNice":
-            if h == "swing":
-                swingMode = SWING_COMFORT_HORIZONTAL
-            else:
-                swingMode = SWING_COMFORT
+                    fd = fan_direction.get(direction)
+                    if fd is not None:
+                        swingMode = fd["currentMode"]["value"].lower()
 
         _LOGGER.info(
-            "Device '%s' has swing mode '%s', determined from h:%s v:%s",
+            "Device '%s' has %s swing mode '%s'",
             self._device.name,
+            direction,
             swingMode,
-            h,
-            v,
         )
 
         return swingMode
 
-    def get_swing_modes(self):
+    def get_swing_mode(self):
+        return self.__get_swing_mode("vertical")
+
+    def get_swing_horizontal_mode(self):
+        return self.__get_swing_mode("horizontal")
+
+    def __get_swing_modes(self, direction):
         swingModes = []
         cc = self.climate_control()
         fanControl = cc.get("fanControl")
         if fanControl is not None:
-            swingModes = [SWING_OFF]
+            swingModes = []
             operationmode = cc["operationMode"]["value"]
             operationmodedict = fanControl["value"]["operationModes"].get(operationmode)
             if operationmodedict is not None:
                 fanDirection = operationmodedict.get("fanDirection")
                 if fanDirection is not None:
-                    horizontal = fanDirection.get("horizontal")
-                    vertical = fanDirection.get("vertical")
-                    if horizontal is not None:
-                        for mode in horizontal["currentMode"]["values"]:
-                            if mode == "swing":
-                                swingModes.append(SWING_HORIZONTAL)
+                    vertical = fanDirection.get(direction)
                     if vertical is not None:
                         for mode in vertical["currentMode"]["values"]:
-                            if mode == "swing":
-                                swingModes.append(SWING_VERTICAL)
-                                if horizontal is not None:
-                                    swingModes.append(SWING_BOTH)
-                            if mode == "floorHeatingAirflow":
-                                swingModes.append(SWING_FLOOR)
-                                if horizontal is not None:
-                                    swingModes.append(SWING_FLOOR_HORIZONTAL)
-                            if mode == "windNice":
-                                swingModes.append(SWING_COMFORT)
-                                if horizontal is not None:
-                                    swingModes.append(SWING_COMFORT_HORIZONTAL)
-        _LOGGER.info("Device '%s' support swing modes %s", self._device.name, swingModes)
+                            swingModes.append(mode.lower())
+        _LOGGER.info("Device '%s' support %s swing modes %s", self._device.name, direction, swingModes)
         return swingModes
 
-    async def async_set_swing_mode(self, swing_mode):
+    def get_swing_modes(self):
+        return self.__get_swing_modes("vertical")
+
+    def get_swing_horizontal_modes(self):
+        return self.__get_swing_modes("horizontal")
+
+    async def __set_swing(self, direction, swing_mode):
         _LOGGER.debug(
-            "Device '%s' request to set swing_mode to %s",
+            "Device '%s' request to set swing %s mode to %s",
             self._device.name,
+            direction,
             swing_mode,
         )
         res = True
@@ -652,51 +624,61 @@ async def async_set_swing_mode(self, swing_mode):
             operation_mode = cc["operationMode"]["value"]
             fan_direction = fan_control["value"]["operationModes"][operation_mode].get("fanDirection")
             if fan_direction is not None:
-                horizontal = fan_direction.get("horizontal")
-                vertical = fan_direction.get("vertical")
-                if horizontal is not None:
-                    new_h_mode = "stop"
-                    if swing_mode in (SWING_HORIZONTAL, SWING_BOTH, SWING_COMFORT_HORIZONTAL, SWING_FLOOR_HORIZONTAL):
-                        new_h_mode = "swing"
-                    res &= await self._device.patch(
+                fd = fan_direction.get(direction)
+                if fd is not None:
+                    new_mode = "stop"
+                    # For translation the current mode is always lower case, but we need to send
+                    # the daikin mixed case mode, so search that
+                    for mode in fd["currentMode"]["values"]:
+                        if swing_mode == mode.lower():
+                            new_mode = mode
+                    res = await self._device.patch(
                         self._device.id,
                         self._embedded_id,
                         "fanControl",
-                        f"/operationModes/{operation_mode}/fanDirection/horizontal/currentMode",
-                        new_h_mode,
+                        f"/operationModes/{operation_mode}/fanDirection/{direction}/currentMode",
+                        new_mode,
                     )
                     if res is False:
                         _LOGGER.warning(
-                            "Device '%s' problem setting horizontal swing mode to %s",
+                            "Device '%s' problem setting %s swing mode to %s",
                             self._device.name,
-                            new_h_mode,
+                            direction,
+                            new_mode,
                         )
+        return res
 
-                if vertical is not None:
-                    new_v_mode = "stop"
-                    if swing_mode in (SWING_VERTICAL, SWING_BOTH):
-                        new_v_mode = "swing"
-                    if swing_mode in (SWING_FLOOR, SWING_FLOOR_HORIZONTAL):
-                        new_v_mode = "floorHeatingAirflow"
-                    if swing_mode in (SWING_COMFORT, SWING_COMFORT_HORIZONTAL):
-                        new_v_mode = "windNice"
-                    res &= await self._device.patch(
-                        self._device.id,
-                        self._embedded_id,
-                        "fanControl",
-                        f"/operationModes/{operation_mode}/fanDirection/vertical/currentMode",
-                        new_v_mode,
-                    )
-                    if res is False:
-                        _LOGGER.warning(
-                            "Device '%s' problem setting vertical swing mode to %s",
-                            self._device.name,
-                            new_v_mode,
-                        )
+    async def async_set_swing_mode(self, swing_mode):
+        res = True
+        if self.swing_mode != swing_mode:
+            res = await self.__set_swing("vertical", swing_mode)
 
-        if res is True:
-            self._attr_swing_mode = swing_mode
-            self.async_write_ha_state()
+            if res is True:
+                self._attr_swing_mode = swing_mode
+                self.async_write_ha_state()
+        else:
+            _LOGGER.debug(
+                "Device '%s' request to set vertical swing mode '%s' ignored already set",
+                self._device.name,
+                swing_mode,
+            )
+
+        return res
+
+    async def async_set_swing_horizontal_mode(self, swing_mode):
+        res = True
+        if self.swing_horizontal_mode != swing_mode:
+            res = await self.__set_swing("horizontal", swing_mode)
+
+            if res is True:
+                self._attr_swing_horizontal_mode = swing_mode
+                self.async_write_ha_state()
+        else:
+            _LOGGER.debug(
+                "Device '%s' request to set horizontal swing mode '%s' ignored already set",
+                self._device.name,
+                swing_mode,
+            )
 
         return res
 

custom_components/daikin_onecta/const.py

@@ -29,11 +29,6 @@
 
 FANMODE_FIXED = "fixed"
 
-SWING_FLOOR = "floor"
-SWING_FLOOR_HORIZONTAL = "floor_horizontal"
-SWING_COMFORT = "comfort"
-SWING_COMFORT_HORIZONTAL = "comfort_horizontal"
-
 SENSOR_PERIOD_DAILY = "d"
 SENSOR_PERIOD_WEEKLY = "w"
 SENSOR_PERIOD_YEARLY = "m"

custom_components/daikin_onecta/icons.json

@@ -14,10 +14,18 @@
               "5": "mdi:numeric-5"
             }
           },
+          "swing_horizontal_mode": {
+            "state": {
+              "stop": "mdi:arrow-oscillating-off",
+              "swing": "mdi:arrow-left-right"
+            }
+          },
           "swing_mode": {
             "state": {
-              "comfort": "mdi:waves",
-              "comfort_horizontal": "mdi:waves-arrow-left"
+              "stop": "mdi:arrow-oscillating-off",
+              "swing": "mdi:arrow-up-down",
+              "windnice": "mdi:waves",
+              "floorheatingairflow": "mdi:arrow-right-bottom"
             }
           },
           "preset_mode": {

custom_components/daikin_onecta/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/jwillemsen/daikin_onecta/issues",
   "requirements": [],
-  "version": "4.1.23"
+  "version": "4.2.0"
 }

custom_components/daikin_onecta/translations/el.json

@@ -61,10 +61,8 @@
           },
           "swing_mode": {
             "state": {
-              "floor": "Ροή Αέρα Θέρμανσης Δαπέδου",
-              "floor_horizontal": "Ροή Αέρα Θέρμανσης Δαπέδου και Οριζόντια",
-              "comfort": "Άνετη Ροή Αέρα",
-              "comfort_horizontal": "Άνετη Ροή Αέρα και Οριζόντια"
+              "floorheatingairflow": "Ροή Αέρα Θέρμανσης Δαπέδου",
+              "windnice": "Άνετη Ροή Αέρα"
             }
           }
         }

custom_components/daikin_onecta/translations/en.json

@@ -61,10 +61,16 @@
           },
           "swing_mode": {
             "state": {
-              "floor": "FloorHeating Airflow",
-              "floor_horizontal": "FloorHeating Airflow and Horizontal",
-              "comfort": "Comfort Airflow",
-              "comfort_horizontal": "Comfort Airflow and Horizontal"
+              "stop": "Stop",
+              "swing": "Swing",
+              "floorheatingairflow": "FloorHeating Airflow",
+              "windnice": "Comfort Airflow"
+            }
+          },
+          "swing_horizontal_mode": {
+            "state": {
+              "stop": "Stop",
+              "swing": "Swing"
             }
           }
         }

custom_components/daikin_onecta/translations/nl.json

@@ -45,10 +45,16 @@
           },
           "swing_mode": {
             "state": {
-              "floor": "Vloer Heating Airflow",
-              "floor_horizontal": "Vloer Heating Airflow en Horizontaal",
-              "comfort": "Comfort Airflow",
-              "comfort_horizontal": "Comfort Airflow en Horizontaal"
+              "stop": "Draaien uit",
+              "swing": "Draaien",
+              "floorheatingairflow": "Vloer Heating Airflow",
+              "windnice": "Comfort Airflow"
+            }
+          },
+          "swing_horizontal_mode": {
+            "state": {
+              "stop": "Draaien uit",
+              "swing": "Draaien"
             }
           }
         }

custom_components/daikin_onecta/translations/sl.json

@@ -61,10 +61,8 @@
           },
           "swing_mode": {
             "state": {
-              "floor": "Tlačni tok ogrevanja",
-              "floor_horizontal": "Tlačni tok ogrevanja in vodoravni",
-              "comfort": "Tok udobja",
-              "comfort_horizontal": "Tok udobja in vodoravni"
+              "floorheatingairflow": "Tlačni tok ogrevanja",
+              "windnice": "Tok udobja"
             }
           }
         }