Hendrik/esphome-truma_inetbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix climate component

Browse Source
This commit is contained in:
Your Name
2023-03-23 12:02:08 +01:00
parent a9115c0d9a
commit 54e289a860
6 changed files with 224 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
components/truma_inetbox/climate/TrumaRoomClimate.cpp
View File

@@ -10,24 +10,37 @@ void TrumaRoomClimate::setup() {
// Publish updated state
this->target_temperature = temp_code_to_decimal(status_heater->target_temp_room);
this->current_temperature = temp_code_to_decimal(status_heater->current_temp_room);
this->mode = (status_heater->operating_status >= OperatingStatus::OPERATING_STATUS_START_OR_COOL_DOWN)
? climate::CLIMATE_MODE_HEAT
: climate::CLIMATE_MODE_OFF;
this->mode = std::isnan(this->target_temperature) ? climate::CLIMATE_MODE_OFF : climate::CLIMATE_MODE_HEAT;
switch (status_heater->heating_mode) {
case HeatingMode::HEATING_MODE_ECO:
this->preset = climate::CLIMATE_PRESET_ECO;
this->fan_mode = climate::CLIMATE_FAN_LOW;
break;
case HeatingMode::HEATING_MODE_HIGH:
this->preset = climate::CLIMATE_PRESET_COMFORT;
this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
break;
case HeatingMode::HEATING_MODE_BOOST:
this->preset = climate::CLIMATE_PRESET_BOOST;
this->fan_mode = climate::CLIMATE_FAN_HIGH;
break;
default:
this->preset = climate::CLIMATE_PRESET_NONE;
this->fan_mode = climate::CLIMATE_FAN_OFF;
break;
}
// switch (status_heater->heating_mode) {
// case HeatingMode::HEATING_MODE_ECO:
// this->preset = climate::CLIMATE_PRESET_ECO;
// break;
// case HeatingMode::HEATING_MODE_HIGH:
// this->preset = climate::CLIMATE_PRESET_COMFORT;
// break;
// case HeatingMode::HEATING_MODE_BOOST:
// this->preset = climate::CLIMATE_PRESET_BOOST;
// break;
// default:
// this->preset = climate::CLIMATE_PRESET_NONE;
// break;
// }
this->publish_state();
});
}
@@ -35,7 +48,7 @@ void TrumaRoomClimate::setup() {
void TrumaRoomClimate::dump_config() { LOG_CLIMATE(TAG, "Truma Room Climate", this); }
void TrumaRoomClimate::control(const climate::ClimateCall &call) {
if (call.get_target_temperature().has_value()) {
if (call.get_target_temperature().has_value() && !call.get_fan_mode().has_value()) {
float temp = *call.get_target_temperature();
this->parent_->get_heater()->action_heater_room(static_cast<u_int8_t>(temp));
}
@@ -56,28 +69,62 @@ void TrumaRoomClimate::control(const climate::ClimateCall &call) {
}
}
if (call.get_preset().has_value()) {
climate::ClimatePreset pres = *call.get_preset();
if (call.get_fan_mode().has_value()) {
auto fan_mode = *call.get_fan_mode();
auto status_heater = this->parent_->get_heater()->get_status();
auto current_target_temp = temp_code_to_decimal(status_heater->target_temp_room);
float temp = temp_code_to_decimal(status_heater->target_temp_room, 0);
if (call.get_target_temperature().has_value()) {
current_target_temp = *call.get_target_temperature();
temp = *call.get_target_temperature();
}
switch (pres) {
case climate::CLIMATE_PRESET_ECO:
this->parent_->get_heater()->action_heater_room(current_target_temp, HeatingMode::HEATING_MODE_ECO);
switch (fan_mode) {
case climate::CLIMATE_FAN_LOW:
case climate::CLIMATE_FAN_MEDIUM:
case climate::CLIMATE_FAN_HIGH:
if (temp < 5) {
temp = 5;
}
break;
case climate::CLIMATE_PRESET_COMFORT:
this->parent_->get_heater()->action_heater_room(current_target_temp, HeatingMode::HEATING_MODE_HIGH);
default:
break;
case climate::CLIMATE_PRESET_BOOST:
this->parent_->get_heater()->action_heater_room(current_target_temp, HeatingMode::HEATING_MODE_BOOST);
}
switch (fan_mode) {
case climate::CLIMATE_FAN_LOW:
this->parent_->get_heater()->action_heater_room(static_cast<u_int8_t>(temp), HeatingMode::HEATING_MODE_ECO);
break;
case climate::CLIMATE_FAN_MEDIUM:
this->parent_->get_heater()->action_heater_room(static_cast<u_int8_t>(temp), HeatingMode::HEATING_MODE_HIGH);
break;
case climate::CLIMATE_FAN_HIGH:
this->parent_->get_heater()->action_heater_room(static_cast<u_int8_t>(temp), HeatingMode::HEATING_MODE_BOOST);
break;
default:
this->parent_->get_heater()->action_heater_room(0);
break;
}
}
// if (call.get_preset().has_value()) {
// climate::ClimatePreset pres = *call.get_preset();
// auto status_heater = this->parent_->get_heater()->get_status();
// auto current_target_temp = temp_code_to_decimal(status_heater->target_temp_room);
// if (call.get_target_temperature().has_value()) {
// current_target_temp = *call.get_target_temperature();
// }
// switch (pres) {
// case climate::CLIMATE_PRESET_ECO:
// this->parent_->get_heater()->action_heater_room(current_target_temp, HeatingMode::HEATING_MODE_ECO);
// break;
// case climate::CLIMATE_PRESET_COMFORT:
// this->parent_->get_heater()->action_heater_room(current_target_temp, HeatingMode::HEATING_MODE_HIGH);
// break;
// case climate::CLIMATE_PRESET_BOOST:
// this->parent_->get_heater()->action_heater_room(current_target_temp, HeatingMode::HEATING_MODE_BOOST);
// break;
// default:
// this->parent_->get_heater()->action_heater_room(0);
// break;
// }
// }
}
climate::ClimateTraits TrumaRoomClimate::traits() {
@@ -85,17 +132,18 @@ climate::ClimateTraits TrumaRoomClimate::traits() {
auto traits = climate::ClimateTraits();
traits.set_supports_current_temperature(true);
traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT});
// traits.set_supported_fan_modes({{
// climate::CLIMATE_FAN_LOW,
// climate::CLIMATE_FAN_MEDIUM,
// climate::CLIMATE_FAN_HIGH,
// }});
traits.set_supported_presets({{
climate::CLIMATE_PRESET_NONE,
climate::CLIMATE_PRESET_ECO,
climate::CLIMATE_PRESET_COMFORT,
climate::CLIMATE_PRESET_BOOST,
traits.set_supported_fan_modes({{
climate::CLIMATE_FAN_OFF,
climate::CLIMATE_FAN_LOW,
climate::CLIMATE_FAN_MEDIUM,
climate::CLIMATE_FAN_HIGH,
}});
// traits.set_supported_presets({{
// climate::CLIMATE_PRESET_NONE,
// climate::CLIMATE_PRESET_ECO,
// climate::CLIMATE_PRESET_COMFORT,
// climate::CLIMATE_PRESET_BOOST,
// }});
traits.set_visual_min_temperature(5);
traits.set_visual_max_temperature(30);
traits.set_visual_temperature_step(1);