From cdbc146e5d032773f8f46dc3994ae2d60f5e2e44 Mon Sep 17 00:00:00 2001
From: carstenschroeder <carsten.schroeder@eskill.de>
Date: Sat, 10 Jul 2021 11:37:55 +0200
Subject: [PATCH] Climate modes COOL and HEAT are auto modes (#1994)

---
 esphome/components/pid/pid_climate.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/esphome/components/pid/pid_climate.cpp b/esphome/components/pid/pid_climate.cpp
index 8a61361fb8..dac4426698 100644
--- a/esphome/components/pid/pid_climate.cpp
+++ b/esphome/components/pid/pid_climate.cpp
@@ -20,7 +20,12 @@ void PIDClimate::setup() {
     restore->to_call(this).perform();
   } else {
     // restore from defaults, change_away handles those for us
-    this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+    if (supports_heat_() && supports_cool_())
+      this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+    else if (supports_cool_())
+      this->mode = climate::CLIMATE_MODE_COOL;
+    else if (supports_heat_())
+      this->mode = climate::CLIMATE_MODE_HEAT;
     this->target_temperature = this->default_target_temperature_;
   }
 }
@@ -41,11 +46,13 @@ climate::ClimateTraits PIDClimate::traits() {
   traits.set_supports_current_temperature(true);
   traits.set_supports_two_point_target_temperature(false);
 
-  traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT_COOL});
+  traits.set_supported_modes({climate::CLIMATE_MODE_OFF});
   if (supports_cool_())
     traits.add_supported_mode(climate::CLIMATE_MODE_COOL);
   if (supports_heat_())
     traits.add_supported_mode(climate::CLIMATE_MODE_HEAT);
+  if (supports_heat_() && supports_cool_())
+    traits.add_supported_mode(climate::CLIMATE_MODE_HEAT_COOL);
 
   traits.set_supports_action(true);
   return traits;
@@ -93,13 +100,8 @@ void PIDClimate::write_output_(float value) {
 }
 void PIDClimate::handle_non_auto_mode_() {
   // in non-auto mode, switch directly to appropriate action
-  //  - HEAT mode / COOL mode -> Output at ±100%
   //  - OFF mode -> Output at 0%
-  if (this->mode == climate::CLIMATE_MODE_HEAT) {
-    this->write_output_(1.0);
-  } else if (this->mode == climate::CLIMATE_MODE_COOL) {
-    this->write_output_(-1.0);
-  } else if (this->mode == climate::CLIMATE_MODE_OFF) {
+  if (this->mode == climate::CLIMATE_MODE_OFF) {
     this->write_output_(0.0);
   } else {
     assert(false);
@@ -132,7 +134,7 @@ void PIDClimate::update_pid_() {
     }
   }
 
-  if (this->mode != climate::CLIMATE_MODE_HEAT_COOL) {
+  if (this->mode == climate::CLIMATE_MODE_OFF) {
     this->handle_non_auto_mode_();
   } else {
     this->write_output_(value);