Airflow control select improvements

Author: pdudnytskyi

README.rst

@@ -291,7 +291,7 @@ Turn off health mode.
 ``climate.haier.set_vertical_airflow`` Action
 *********************************************
 
-(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: Health_Up, Max_Up, Up, Center, Down, Health_Down.
+(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: ``Auto``, ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
 
 .. code-block:: yaml
 
@@ -304,15 +304,15 @@ Turn off health mode.
 ``climate.haier.set_horizontal_airflow`` Action
 ***********************************************
 
-(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
+(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Auto``, ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
 
 .. code-block:: yaml
 
     on_...:
       then:
         - climate.haier.set_horizontal_airflow:
           id: device_id
-          vertical_airflow: Right
+          horizontal_airflow: Right
 
 ``climate.haier.start_self_cleaning`` Action
 ********************************************
@@ -512,31 +512,43 @@ Haier Climate Select
 
 Select components to support vertical and horizontal airflow directions settings for Haier AC.
 
+Vertical airflow select:
+
 .. code-block:: yaml
 
-    # Example configuration entry
     select:
       - platform: haier
-        horizontal_airflow:
-          name: Haier airflow horizontal
+        haier_id: ${device_id}
         vertical_airflow:
-          name: Haier airflow vertical
+          name: ${device_name} airflow vertical
+
+
+Horizontal airflow select:
+
+.. code-block:: yaml
+
+    select:
+      - platform: haier
+        haier_id: ${device_id}
+        horizontal_airflow:
+          name: ${device_name} airflow horizontal
+
 
 Configuration variables:
 ------------------------
 
 - **haier_id** (**Required**, `ID <https://esphome.io/guides/configuration-types.html#config-id>`_): The id of Haier climate component
-- **horizontal_airflow** (*Optional*): (supported only by hOn) Select component to control horizontal airflow mode (if supported by AC).
+- **horizontal_airflow** (*Optional*): (supported only by hOn) Select component to control horizontal airflow mode (if supported by AC). The current state becomes ``Auto`` while horizontal swing is enabled.
   All options from `Select <https://esphome.io/components/select/index.html#base-select-configuration>`_.
-- **vertical_airflow** (*Optional*): (supported only by hOn) Select component to control vertical airflow mode (if supported by AC).
+- **vertical_airflow** (*Optional*): (supported only by hOn) Select component to control vertical airflow mode (if supported by AC). The current state becomes ``Auto`` while vertical swing is enabled.
   All options from `Select <https://esphome.io/components/select/index.html#base-select-configuration>`_.
 
 .. Generated from esphome-docs/switch/haier.rst
 
 Haier Climate Switches
 ======================
 
- Switches to support additional features for Haier AC.
+Switches to support additional features for Haier AC.
 
 .. code-block:: yaml
 
@@ -615,6 +627,7 @@ See Also
 - `ESPHome Haier Climate Binary Sensors <https://esphome.io/components/binary_sensor/haier.html>`_
 - `ESPHome Haier Climate Text Sensors <https://esphome.io/components/text_sensor/haier.html>`_
 - `ESPHome Haier Climate Buttons <https://esphome.io/components/button/haier.html>`_
+- `ESPHome Haier Climate Select <https://esphome.io/components/select/haier.html>`_
 - `ESPHome Haier Climate Switches <https://esphome.io/components/switch/haier.html>`_
 - `Climate Component <https://esphome.io/components/climate/>`_
 - `API Reference <https://esphome.io/api/haier__base_8h.html>`_

components/haier/hon_climate.cpp

@@ -1,3 +1,5 @@
+#include <algorithm>
+#include <array>
 #include <chrono>
 #include <string>
 #include "esphome/components/climate/climate.h"
@@ -32,6 +34,32 @@ const std::vector<hon_protocol::HorizontalSwingMode> HORIZONTAL_SWING_MODES_ORDE
   hon_protocol::HorizontalSwingMode::RIGHT,
   hon_protocol::HorizontalSwingMode::MAX_RIGHT,
 };
+
+static const std::array<const char *, 8> VERTICAL_SWING_MODE_OPTIONS = {
+    "Auto", "Health Up", "Max Up", "Up", "Center", "Down", "Max Down", "Health Down"};
+static const std::array<const char *, 6> HORIZONTAL_SWING_MODE_OPTIONS = {
+    "Auto", "Max Left", "Left", "Center", "Right", "Max Right"};
+
+static std::string vertical_swing_mode_to_string_(hon_protocol::VerticalSwingMode mode) {
+  if (mode == hon_protocol::VerticalSwingMode::AUTO_SPECIAL) {
+    return VERTICAL_SWING_MODE_OPTIONS[0];
+  }
+  auto mode_it = std::find(VERTICAL_SWING_MODES_ORDER.begin(), VERTICAL_SWING_MODES_ORDER.end(), mode);
+  if (mode_it == VERTICAL_SWING_MODES_ORDER.end()) {
+    ESP_LOGW("haier.climate", "Unsupported vertical airflow mode: 0x%X", static_cast<uint8_t>(mode));
+    return VERTICAL_SWING_MODE_OPTIONS[4];
+  }
+  return VERTICAL_SWING_MODE_OPTIONS[mode_it - VERTICAL_SWING_MODES_ORDER.begin()];
+}
+
+static std::string horizontal_swing_mode_to_string_(hon_protocol::HorizontalSwingMode mode) {
+  auto mode_it = std::find(HORIZONTAL_SWING_MODES_ORDER.begin(), HORIZONTAL_SWING_MODES_ORDER.end(), mode);
+  if (mode_it == HORIZONTAL_SWING_MODES_ORDER.end()) {
+    ESP_LOGW("haier.climate", "Unsupported horizontal airflow mode: 0x%X", static_cast<uint8_t>(mode));
+    return HORIZONTAL_SWING_MODE_OPTIONS[3];
+  }
+  return HORIZONTAL_SWING_MODE_OPTIONS[mode_it - HORIZONTAL_SWING_MODES_ORDER.begin()];
+}
 #endif // USE_SELECT
 
 static const char *const TAG = "haier.climate";
@@ -843,17 +871,18 @@ void HonClimate::set_quiet_mode_switch(switch_::Switch *sw) {
 
 #ifdef USE_SELECT
 void HonClimate::set_vertical_airflow_select(select::Select *sel) {
-//  this->vertical_airflow_select_ = sel;
-//  if (this->current_vertical_swing_.has_value() && (this->vertical_airflow_select_ != nullptr)) {
-//    this->vertical_airflow_select_->publish_state(VerticalAirflowSelect::vertical_airflow_to_string(this->current_vertical_swing_.value()));
-//  }
+  this->vertical_airflow_select_ = sel;
+  if ((this->vertical_airflow_select_ != nullptr) && this->current_vertical_swing_.has_value()) {
+    this->vertical_airflow_select_->publish_state(vertical_swing_mode_to_string_(this->current_vertical_swing_.value()));
+  }
 }
 
 void HonClimate::set_horizontal_airflow_select(select::Select *sel) {
-//  this->horizontal_airflow_select_ = sel;
-//  if (this->horizontal_airflow_select_ != nullptr) {
-//    this->horizontal_airflow_select_->publish_state((uint8_t) this->settings_.last_horizontal_swing);
-//  }
+  this->horizontal_airflow_select_ = sel;
+  if ((this->horizontal_airflow_select_ != nullptr) && this->current_horizontal_swing_.has_value()) {
+    this->horizontal_airflow_select_->publish_state(
+        horizontal_swing_mode_to_string_(this->current_horizontal_swing_.value()));
+  }
 }
 #endif  // USE_SELECT
 
@@ -1101,6 +1130,15 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
       this->settings_.last_horizontal_swing = this->current_horizontal_swing_.value();
       this->hon_rtc_.save(&this->settings_);
     }
+#ifdef USE_SELECT
+    if (this->vertical_airflow_select_ != nullptr) {
+      this->vertical_airflow_select_->publish_state(vertical_swing_mode_to_string_(this->current_vertical_swing_.value()));
+    }
+    if (this->horizontal_airflow_select_ != nullptr) {
+      this->horizontal_airflow_select_->publish_state(
+          horizontal_swing_mode_to_string_(this->current_horizontal_swing_.value()));
+    }
+#endif  // USE_SELECT
     should_publish = should_publish || (old_swing_mode != this->swing_mode);
   }
   this->last_valid_status_timestamp_ = std::chrono::steady_clock::now();

components/haier/select/__init__.py

@@ -2,14 +2,12 @@
 import esphome.config_validation as cv
 from esphome.components import select
 from esphome.const import (
-    CONF_OPTIONS,
     ENTITY_CATEGORY_CONFIG,
 )
 from ..climate import (
     CONF_HAIER_ID,
     HonClimate,
     haier_ns,
-    hon_protocol_ns,
     CONF_VERTICAL_AIRFLOW,
     CONF_HORIZONTAL_AIRFLOW,
 )
@@ -18,9 +16,6 @@
 VerticalAirflowSelect = haier_ns.class_("VerticalAirflowSelect", select.Select)
 HorizontalAirflowSelect = haier_ns.class_("HorizontalAirflowSelect", select.Select)
 
-VerticalSwingMode = hon_protocol_ns.enum("VerticalSwingMode", True)
-HorizontalSwingMode = hon_protocol_ns.enum("HorizontalSwingMode", True)
-
 # Additional icons
 ICON_ARROW_HORIZONTAL =  "mdi:arrow-expand-horizontal"
 ICON_ARROW_VERTICAL = "mdi:arrow-expand-vertical"
@@ -62,7 +57,7 @@
 )
 
 async def to_code(config):
-    full_id, parent = await cg.get_variable_with_full_id(config[CONF_HAIER_ID])
+    parent = await cg.get_variable(config[CONF_HAIER_ID])
 
     if conf := config.get(CONF_VERTICAL_AIRFLOW):
         sel_var = await select.new_select(conf, options=AIRFLOW_VERTICAL_DIRECTION_OPTIONS)

components/haier/select/horizontal_airflow.cpp

@@ -1,13 +1,16 @@
 #include "horizontal_airflow.h"
+
+#include <algorithm>
+
 #include <protocol/haier_protocol.h>
 
 namespace esphome {
 namespace haier {
 
 void HorizontalAirflowSelect::control(const std::string &value) {
   hon_protocol::HorizontalSwingMode state;
-  static const std::vector<std::string> options = this->traits.get_options();
-  auto item_it = std::find(options.begin(), options.end(), value);
+  const auto &options = this->traits.get_options();
+  auto item_it = std::find_if(options.begin(), options.end(), [&value](const char *opt) { return value == opt; });
   if (item_it == options.end()) {
     ESP_LOGE("haier", "Invalid horizontal airflow mode: %s", value.c_str());
     return;

components/haier/select/vertical_airflow.cpp

@@ -1,13 +1,16 @@
 #include "vertical_airflow.h"
+
+#include <algorithm>
+
 #include <protocol/haier_protocol.h>
 
 namespace esphome {
 namespace haier {
 
 void VerticalAirflowSelect::control(const std::string &value) {
   hon_protocol::VerticalSwingMode state;
-  static const std::vector<std::string> options = this->traits.get_options();
-  auto item_it = std::find(options.begin(), options.end(), value);
+  const auto &options = this->traits.get_options();
+  auto item_it = std::find_if(options.begin(), options.end(), [&value](const char *opt) { return value == opt; });
   if (item_it == options.end()) {
     ESP_LOGE("haier", "Invalid vertical airflow mode: %s", value.c_str());
     return;

configs/select/airflow_horizontal.yaml

@@ -1,4 +1,5 @@
 select:
   - platform: haier
+    haier_id: ${device_id}
     horizontal_airflow:
       name: ${device_name} airflow horizontal

configs/select/airflow_vertical.yaml

@@ -1,4 +1,5 @@
 select:
   - platform: haier
+    haier_id: ${device_id}
     vertical_airflow:
       name: ${device_name} airflow vertical

docs/esphome-docs/climate/haier.rst

@@ -57,53 +57,53 @@ This component requires a :ref:`UART bus <uart>` to be setup.
 
 .. code-block:: yaml
 
-    # Example configuration entry
-    climate:
-      - platform: haier
-        id: haier_ac
-        protocol: hon
-        name: Haier AC
-        uart_id: ac_port
-        wifi_signal: true
-        display: true
-        visual:
-          min_temperature: 16 °C
-          max_temperature: 30 °C
-          temperature_step: 1 °C
-        supported_modes:
-        - 'OFF'
-        - HEAT_COOL
-        - COOL
-        - HEAT
-        - DRY
-        - FAN_ONLY
-        supported_swing_modes:
-        - 'OFF'
-        - VERTICAL
-        - HORIZONTAL
-        - BOTH
-        supported_presets:
-        - AWAY
-        - BOOST
-        - SLEEP
-        on_alarm_start:
-          then:
-            - logger.log:
-                level: WARN
-                format: "Alarm activated. Code: %d. Message: \"%s\""
-                args: [ code, message]
-        on_alarm_end:
-          then:
-            - logger.log:
-                level: INFO
-                format: "Alarm deactivated. Code: %d. Message: \"%s\""
-                args: [ code, message]
-        on_status_message:
-          then:
-            - logger.log:
-                level: INFO
-                format: "New status message received, size=%d, subcmd=%02X%02X"
-                args: [ 'data_size', 'data[0]', 'data[1]' ]
+    # Example configuration entry
+    climate:
+      - platform: haier
+        id: haier_ac
+        protocol: hon
+        name: Haier AC
+        uart_id: ac_port
+        wifi_signal: true
+        display: true
+        visual:
+          min_temperature: 16 °C
+          max_temperature: 30 °C
+          temperature_step: 1 °C
+        supported_modes:
+        - 'OFF'
+        - HEAT_COOL
+        - COOL
+        - HEAT
+        - DRY
+        - FAN_ONLY
+        supported_swing_modes:
+        - 'OFF'
+        - VERTICAL
+        - HORIZONTAL
+        - BOTH
+        supported_presets:
+        - AWAY
+        - BOOST
+        - SLEEP
+        on_alarm_start:
+          then:
+            - logger.log:
+                level: WARN
+                format: "Alarm activated. Code: %d. Message: \"%s\""
+                args: [ code, message]
+        on_alarm_end:
+          then:
+            - logger.log:
+                level: INFO
+                format: "Alarm deactivated. Code: %d. Message: \"%s\""
+                args: [ code, message]
+        on_status_message:
+          then:
+            - logger.log:
+                level: INFO
+                format: "New status message received, size=%d, subcmd=%02X%02X"
+                args: [ 'data_size', 'data[0]', 'data[1]' ]
 
 
 Configuration variables:
@@ -291,7 +291,7 @@ Turn off health mode.
 ``climate.haier.set_vertical_airflow`` Action
 *********************************************
 
-(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: Health_Up, Max_Up, Up, Center, Down, Health_Down.
+(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: ``Auto``, ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
 
 .. code-block:: yaml
 
@@ -304,15 +304,15 @@ Turn off health mode.
 ``climate.haier.set_horizontal_airflow`` Action
 ***********************************************
 
-(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
+(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Auto``, ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
 
 .. code-block:: yaml
 
     on_...:
       then:
         - climate.haier.set_horizontal_airflow:
           id: device_id
-          vertical_airflow: Right
+          horizontal_airflow: Right
 
 ``climate.haier.start_self_cleaning`` Action
 ********************************************
@@ -344,6 +344,7 @@ See Also
 - :doc:`Haier Climate Binary Sensors </components/binary_sensor/haier>`
 - :doc:`Haier Climate Text Sensors </components/text_sensor/haier>`
 - :doc:`Haier Climate Buttons </components/button/haier>`
+- :doc:`Haier Climate Select </components/select/haier>`
 - :doc:`Haier Climate Switches </components/switch/haier>`
 - :doc:`/components/climate/index`
 - :apiref:`haier/climate/haier_base.h`