Airflow control select improvements 2

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: ``Auto``, ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
+(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
 
 .. code-block:: yaml
 
@@ -304,7 +304,7 @@ 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: ``Auto``, ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
+(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
 
 .. code-block:: yaml
 
@@ -538,9 +538,9 @@ 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). The current state becomes ``Auto`` while horizontal swing is enabled.
+- **horizontal_airflow** (*Optional*): (supported only by hOn) Select component to control horizontal airflow mode (if supported by AC). This select has no state 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). The current state becomes ``Auto`` while vertical swing is enabled.
+- **vertical_airflow** (*Optional*): (supported only by hOn) Select component to control vertical airflow mode (if supported by AC). This select has no state 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

components/haier/hon_climate.cpp

@@ -3,6 +3,7 @@
 #include <chrono>
 #include <string>
 #include "esphome/components/climate/climate.h"
+#include "esphome/core/controller_registry.h"
 #include "esphome/components/uart/uart.h"
 #include "esphome/core/helpers.h"
 #include "hon_climate.h"
@@ -16,7 +17,6 @@ namespace haier {
 
 #ifdef USE_SELECT
 const std::vector<hon_protocol::VerticalSwingMode> VERTICAL_SWING_MODES_ORDER = {
-  hon_protocol::VerticalSwingMode::AUTO,
   hon_protocol::VerticalSwingMode::HEALTH_UP,
   hon_protocol::VerticalSwingMode::MAX_UP,
   hon_protocol::VerticalSwingMode::UP,
@@ -27,38 +27,29 @@ const std::vector<hon_protocol::VerticalSwingMode> VERTICAL_SWING_MODES_ORDER =
 };
 
 const std::vector<hon_protocol::HorizontalSwingMode> HORIZONTAL_SWING_MODES_ORDER = {
-  hon_protocol::HorizontalSwingMode::AUTO,
   hon_protocol::HorizontalSwingMode::MAX_LEFT,
   hon_protocol::HorizontalSwingMode::LEFT,
   hon_protocol::HorizontalSwingMode::CENTER,
   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 bool vertical_swing_mode_is_selectable_(hon_protocol::VerticalSwingMode mode) {
+  return (mode != hon_protocol::VerticalSwingMode::AUTO) && (mode != hon_protocol::VerticalSwingMode::AUTO_SPECIAL);
+}
 
-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 bool horizontal_swing_mode_is_selectable_(hon_protocol::HorizontalSwingMode mode) {
+  return mode != hon_protocol::HorizontalSwingMode::AUTO;
 }
 
-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];
+static void clear_airflow_select_state_(select::Select *sel) {
+  if (sel == nullptr) {
+    return;
   }
-  return HORIZONTAL_SWING_MODE_OPTIONS[mode_it - HORIZONTAL_SWING_MODES_ORDER.begin()];
+  sel->set_has_state(false);
+#if defined(USE_SELECT) && defined(USE_CONTROLLER_REGISTRY)
+  ControllerRegistry::notify_select_update(sel);
+#endif
 }
 #endif // USE_SELECT
 
@@ -872,17 +863,51 @@ 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->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()));
-  }
+  this->update_vertical_airflow_select_state_();
 }
 
 void HonClimate::set_horizontal_airflow_select(select::Select *sel) {
   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()));
+  this->update_horizontal_airflow_select_state_();
+}
+
+void HonClimate::update_vertical_airflow_select_state_() {
+  if (this->vertical_airflow_select_ == nullptr) {
+    return;
   }
+  if (!this->current_vertical_swing_.has_value() ||
+      !vertical_swing_mode_is_selectable_(this->current_vertical_swing_.value())) {
+    clear_airflow_select_state_(this->vertical_airflow_select_);
+    return;
+  }
+  auto mode_it = std::find(VERTICAL_SWING_MODES_ORDER.begin(), VERTICAL_SWING_MODES_ORDER.end(),
+                           this->current_vertical_swing_.value());
+  if (mode_it == VERTICAL_SWING_MODES_ORDER.end()) {
+    ESP_LOGW(TAG, "Unsupported vertical airflow mode: 0x%X", static_cast<uint8_t>(this->current_vertical_swing_.value()));
+    clear_airflow_select_state_(this->vertical_airflow_select_);
+    return;
+  }
+  this->vertical_airflow_select_->publish_state(static_cast<size_t>(mode_it - VERTICAL_SWING_MODES_ORDER.begin()));
+}
+
+void HonClimate::update_horizontal_airflow_select_state_() {
+  if (this->horizontal_airflow_select_ == nullptr) {
+    return;
+  }
+  if (!this->current_horizontal_swing_.has_value() ||
+      !horizontal_swing_mode_is_selectable_(this->current_horizontal_swing_.value())) {
+    clear_airflow_select_state_(this->horizontal_airflow_select_);
+    return;
+  }
+  auto mode_it = std::find(HORIZONTAL_SWING_MODES_ORDER.begin(), HORIZONTAL_SWING_MODES_ORDER.end(),
+                           this->current_horizontal_swing_.value());
+  if (mode_it == HORIZONTAL_SWING_MODES_ORDER.end()) {
+    ESP_LOGW(TAG, "Unsupported horizontal airflow mode: 0x%X",
+             static_cast<uint8_t>(this->current_horizontal_swing_.value()));
+    clear_airflow_select_state_(this->horizontal_airflow_select_);
+    return;
+  }
+  this->horizontal_airflow_select_->publish_state(static_cast<size_t>(mode_it - HORIZONTAL_SWING_MODES_ORDER.begin()));
 }
 #endif  // USE_SELECT
 
@@ -1131,13 +1156,8 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
       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()));
-    }
+    this->update_vertical_airflow_select_state_();
+    this->update_horizontal_airflow_select_state_();
 #endif  // USE_SELECT
     should_publish = should_publish || (old_swing_mode != this->swing_mode);
   }

components/haier/hon_climate.h

@@ -116,6 +116,8 @@ class HonClimate : public HaierClimateBase {
   void set_horizontal_airflow_select(select::Select *sel);
 
  protected:
+  void update_vertical_airflow_select_state_();
+  void update_horizontal_airflow_select_state_();
   select::Select *vertical_airflow_select_{nullptr};
   select::Select *horizontal_airflow_select_{nullptr};
 #endif

components/haier/select/__init__.py

@@ -21,7 +21,6 @@
 ICON_ARROW_VERTICAL = "mdi:arrow-expand-vertical"
 
 AIRFLOW_VERTICAL_DIRECTION_OPTIONS = [
-    "Auto",
     "Health Up",
     "Max Up",
     "Up",
@@ -32,7 +31,6 @@
 ]
 
 AIRFLOW_HORIZONTAL_DIRECTION_OPTIONS = [
-    "Auto",
     "Max Left",
     "Left",
     "Center",

docs/esphome-docs/climate/haier.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: ``Auto``, ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
+(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
 
 .. code-block:: yaml
 
@@ -304,7 +304,7 @@ 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: ``Auto``, ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
+(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
 
 .. code-block:: yaml
 

docs/esphome-docs/select/haier.rst

@@ -33,9 +33,9 @@ Configuration variables:
 ------------------------
 
 - **haier_id** (**Required**, :ref:`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). The current state becomes ``Auto`` while horizontal swing is enabled.
+- **horizontal_airflow** (*Optional*): (supported only by hOn) Select component to control horizontal airflow mode (if supported by AC). This select has no state while horizontal swing is enabled.
   All options from :ref:`Select <config-select>`.
-- **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.
+- **vertical_airflow** (*Optional*): (supported only by hOn) Select component to control vertical airflow mode (if supported by AC). This select has no state while vertical swing is enabled.
   All options from :ref:`Select <config-select>`.
 
 See Also

docs/examples/climate_haier.rst

@@ -242,7 +242,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: ``Auto``, ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
+(supported only by hOn) Set direction for vertical airflow if the vertical swing is disabled. Possible values: ``Health_Up``, ``Max_Up``, ``Up``, ``Center``, ``Down``, ``Max_Down``, ``Health_Down``.
 
 .. code-block:: yaml
 
@@ -255,7 +255,7 @@ 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: ``Auto``, ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
+(supported only by hOn) Set direction for horizontal airflow if the horizontal swing is disabled. Possible values: ``Max_Left``, ``Left``, ``Center``, ``Right``, ``Max_Right``.
 
 .. code-block:: yaml
 

docs/examples/select_haier.rst

@@ -19,9 +19,9 @@ Configuration variables:
 ------------------------
 
 - **haier_id** (**Required**, :ref:`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). The current state becomes ``Auto`` while horizontal swing is enabled.
+- **horizontal_airflow** (*Optional*): (supported only by hOn) Select component to control horizontal airflow mode (if supported by AC). This select has no state while horizontal swing is enabled.
   All options from :ref:`Select <config-select>`.
-- **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.
+- **vertical_airflow** (*Optional*): (supported only by hOn) Select component to control vertical airflow mode (if supported by AC). This select has no state while vertical swing is enabled.
   All options from :ref:`Select <config-select>`.
 
 See Also

docs/update_docs.cmd

@@ -6,14 +6,14 @@ echo                                  Updaiting ESPHome haier climate doc
 echo ===============================================================================================================
 python %base_path%script/process_examples.py %base_path%examples/climate_haier.rst %base_path%esphome-docs/climate/haier.rst no_header
 echo ===============================================================================================================
-echo                                  Updaiting README.rst
-echo ===============================================================================================================
-python %base_path%script/make_doc.py README.rst
-echo ===============================================================================================================
 echo                                  Updaiting ESPHome haier select doc
 echo ===============================================================================================================
 python %base_path%script/process_examples.py %base_path%examples/select_haier.rst %base_path%esphome-docs/select/haier.rst no_header
 echo ===============================================================================================================
+echo                                  Updaiting README.rst
+echo ===============================================================================================================
+python %base_path%script/make_doc.py README.rst
+echo ===============================================================================================================
 echo                                  Updaiting docs/hon_example.rst
 echo ===============================================================================================================
 python %base_path%script/process_examples.py %base_path%examples/hon_example.rst %base_path%hon_example.rst

tests/.simple-hon.yaml

@@ -1,4 +1,13 @@
-climate:
-  - platform: haier
-    protocol: hon
-    name: ${device_name}
+climate:
+  - platform: haier
+    protocol: hon
+    id: haier_ac
+    name: ${device_name}
+
+select:
+  - platform: haier
+    haier_id: haier_ac
+    vertical_airflow:
+      name: ${device_name} airflow vertical
+    horizontal_airflow:
+      name: ${device_name} airflow horizontal