Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-19 16:07:47 +01:00
Code Issues Projects Releases Wiki Activity

Climate modes COOL and HEAT are auto modes (#1994)

Browse Source
This commit is contained in:
carstenschroeder 2021-07-10 11:37:55 +02:00 committed by GitHub
parent 7ae611256a
commit cdbc146e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
esphome/components/pid/pid_climate.cpp
View File

@ -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);