sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Adds support for Tuya Climate temperature multiplier (#1276)

Browse Source 
* Adds support for temperature multiplier

* Add new multiplier to test file

* Remove import

* Fixes
This commit is contained in:
Jesse Hills
2020-09-15 10:33:37 +12:00
committed by Guillermo Ruffino
parent 9c5b693dd5
commit 1d06426281
4 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
esphome/components/tuya/climate/__init__.py
View File

@@ -7,9 +7,9 @@ from .. import tuya_ns, CONF_TUYA_ID, Tuya
DEPENDENCIES = ['tuya'] DEPENDENCIES = ['tuya']
CODEOWNERS = ['@jesserockz'] CODEOWNERS = ['@jesserockz']
CONF_TARGET_TEMPERATURE_DATAPOINT = "target_temperature_datapoint" CONF_TARGET_TEMPERATURE_DATAPOINT = 'target_temperature_datapoint'
CONF_CURRENT_TEMPERATURE_DATAPOINT = "current_temperature_datapoint" CONF_CURRENT_TEMPERATURE_DATAPOINT = 'current_temperature_datapoint'
# CONF_ECO_MODE_DATAPOINT = "eco_mode_datapoint" CONF_TEMPERATURE_MULTIPLIER = 'temperature_multiplier'
TuyaClimate = tuya_ns.class_('TuyaClimate', climate.Climate, cg.Component) TuyaClimate = tuya_ns.class_('TuyaClimate', climate.Climate, cg.Component)
@@ -19,7 +19,7 @@ CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t, cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
cv.Optional(CONF_TARGET_TEMPERATURE_DATAPOINT): cv.uint8_t, cv.Optional(CONF_TARGET_TEMPERATURE_DATAPOINT): cv.uint8_t,
cv.Optional(CONF_CURRENT_TEMPERATURE_DATAPOINT): cv.uint8_t, cv.Optional(CONF_CURRENT_TEMPERATURE_DATAPOINT): cv.uint8_t,
# cv.Optional(CONF_ECO_MODE_DATAPOINT): cv.uint8_t, cv.Optional(CONF_TEMPERATURE_MULTIPLIER, default=1): cv.positive_float,
}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key( }).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(
CONF_TARGET_TEMPERATURE_DATAPOINT, CONF_SWITCH_DATAPOINT)) CONF_TARGET_TEMPERATURE_DATAPOINT, CONF_SWITCH_DATAPOINT))
@@ -38,5 +38,4 @@ def to_code(config):
cg.add(var.set_target_temperature_id(config[CONF_TARGET_TEMPERATURE_DATAPOINT])) cg.add(var.set_target_temperature_id(config[CONF_TARGET_TEMPERATURE_DATAPOINT]))
if CONF_CURRENT_TEMPERATURE_DATAPOINT in config: if CONF_CURRENT_TEMPERATURE_DATAPOINT in config:
cg.add(var.set_current_temperature_id(config[CONF_CURRENT_TEMPERATURE_DATAPOINT])) cg.add(var.set_current_temperature_id(config[CONF_CURRENT_TEMPERATURE_DATAPOINT]))
# if CONF_ECO_MODE_DATAPOINT in config: cg.add(var.set_temperature_multiplier(config[CONF_TEMPERATURE_MULTIPLIER]))
# cg.add(var.set_eco_mode_id(config[CONF_ECO_MODE_DATAPOINT]))

38
esphome/components/tuya/climate/tuya_climate.cpp
View File

@@ -21,28 +21,20 @@ void TuyaClimate::setup() {
} }
if (this->target_temperature_id_.has_value()) { if (this->target_temperature_id_.has_value()) {
this->parent_->register_listener(*this->target_temperature_id_, [this](TuyaDatapoint datapoint) { this->parent_->register_listener(*this->target_temperature_id_, [this](TuyaDatapoint datapoint) {
this->target_temperature = datapoint.value_int; this->target_temperature = datapoint.value_int * this->temperature_multiplier_;
this->compute_state_(); this->compute_state_();
this->publish_state(); this->publish_state();
ESP_LOGD(TAG, "MCU reported target temperature is: %d", datapoint.value_int); ESP_LOGD(TAG, "MCU reported target temperature is: %.1f", this->target_temperature);
}); });
} }
if (this->current_temperature_id_.has_value()) { if (this->current_temperature_id_.has_value()) {
this->parent_->register_listener(*this->current_temperature_id_, [this](TuyaDatapoint datapoint) { this->parent_->register_listener(*this->current_temperature_id_, [this](TuyaDatapoint datapoint) {
this->current_temperature = datapoint.value_int; this->current_temperature = datapoint.value_int * this->temperature_multiplier_;
this->compute_state_(); this->compute_state_();
this->publish_state(); this->publish_state();
ESP_LOGD(TAG, "MCU reported current temperature is: %d", datapoint.value_int); ESP_LOGD(TAG, "MCU reported current temperature is: %.1f", this->current_temperature);
}); });
} }
// if (this->eco_mode_id_.has_value()) {
// this->parent_->register_listener(*this->eco_mode_id_, [this](TuyaDatapoint datapoint) {
// this->eco_mode = datapoint.value_bool;
// this->compute_state_();
// this->publish_state();
// ESP_LOGD(TAG, "MCU reported eco mode of: %s", ONOFF(datapoint.value_bool));
// });
// }
} }
void TuyaClimate::control(const climate::ClimateCall &call) { void TuyaClimate::control(const climate::ClimateCall &call) {
@@ -56,30 +48,17 @@ void TuyaClimate::control(const climate::ClimateCall &call) {
this->parent_->set_datapoint_value(datapoint); this->parent_->set_datapoint_value(datapoint);
ESP_LOGD(TAG, "Setting switch: %s", ONOFF(datapoint.value_bool)); ESP_LOGD(TAG, "Setting switch: %s", ONOFF(datapoint.value_bool));
} }
if (call.get_target_temperature_low().has_value())
this->target_temperature_low = *call.get_target_temperature_low();
if (call.get_target_temperature_high().has_value())
this->target_temperature_high = *call.get_target_temperature_high();
if (call.get_target_temperature().has_value()) { if (call.get_target_temperature().has_value()) {
this->target_temperature = *call.get_target_temperature(); this->target_temperature = *call.get_target_temperature();
TuyaDatapoint datapoint{}; TuyaDatapoint datapoint{};
datapoint.id = *this->target_temperature_id_; datapoint.id = *this->target_temperature_id_;
datapoint.type = TuyaDatapointType::INTEGER; datapoint.type = TuyaDatapointType::INTEGER;
datapoint.value_int = (int) this->target_temperature; datapoint.value_int = (int) (this->target_temperature / this->temperature_multiplier_);
this->parent_->set_datapoint_value(datapoint); this->parent_->set_datapoint_value(datapoint);
ESP_LOGD(TAG, "Setting target temperature: %d", datapoint.value_int); ESP_LOGD(TAG, "Setting target temperature: %.1f", this->target_temperature);
} }
// if (call.get_eco_mode().has_value()) {
// this->eco_mode = *call.get_eco_mode();
// TuyaDatapoint datapoint{};
// datapoint.id = *this->eco_mode_id_;
// datapoint.type = TuyaDatapointType::BOOLEAN;
// datapoint.value_bool = this->eco_mode;
// this->parent_->set_datapoint_value(datapoint);
// ESP_LOGD(TAG, "Setting eco mode: %s", ONOFF(datapoint.value_bool));
// }
this->compute_state_(); this->compute_state_();
this->publish_state(); this->publish_state();
@@ -89,7 +68,6 @@ climate::ClimateTraits TuyaClimate::traits() {
auto traits = climate::ClimateTraits(); auto traits = climate::ClimateTraits();
traits.set_supports_current_temperature(this->current_temperature_id_.has_value()); traits.set_supports_current_temperature(this->current_temperature_id_.has_value());
traits.set_supports_heat_mode(true); traits.set_supports_heat_mode(true);
// traits.set_supports_eco_mode(this->eco_mode_id_.has_value());
traits.set_supports_action(true); traits.set_supports_action(true);
return traits; return traits;
} }
@@ -102,8 +80,6 @@ void TuyaClimate::dump_config() {
ESP_LOGCONFIG(TAG, " Target Temperature has datapoint ID %u", *this->target_temperature_id_); ESP_LOGCONFIG(TAG, " Target Temperature has datapoint ID %u", *this->target_temperature_id_);
if (this->current_temperature_id_.has_value()) if (this->current_temperature_id_.has_value())
ESP_LOGCONFIG(TAG, " Current Temperature has datapoint ID %u", *this->current_temperature_id_); ESP_LOGCONFIG(TAG, " Current Temperature has datapoint ID %u", *this->current_temperature_id_);
// if (this->eco_mode_id_.has_value())
// ESP_LOGCONFIG(TAG, " Eco Mode has datapoint ID %u", *this->mode_id_);
} }
void TuyaClimate::compute_state_() { void TuyaClimate::compute_state_() {

6
esphome/components/tuya/climate/tuya_climate.h
View File

@@ -18,7 +18,9 @@ class TuyaClimate : public climate::Climate, public Component {
void set_current_temperature_id(uint8_t current_temperature_id) { void set_current_temperature_id(uint8_t current_temperature_id) {
this->current_temperature_id_ = current_temperature_id; this->current_temperature_id_ = current_temperature_id;
} }
// void set_eco_mode_id(uint8_t eco_mode_id) { this->eco_mode_id_ = eco_mode_id; } void set_temperature_multiplier(float temperature_multiplier) {
this->temperature_multiplier_ = temperature_multiplier;
}
void set_tuya_parent(Tuya *parent) { this->parent_ = parent; } void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
@@ -38,7 +40,7 @@ class TuyaClimate : public climate::Climate, public Component {
optional<uint8_t> switch_id_{}; optional<uint8_t> switch_id_{};
optional<uint8_t> target_temperature_id_{}; optional<uint8_t> target_temperature_id_{};
optional<uint8_t> current_temperature_id_{}; optional<uint8_t> current_temperature_id_{};
// optional<uint8_t> eco_mode_id_{}; float temperature_multiplier_{1.0f};
}; };
} // namespace tuya } // namespace tuya

1
tests/test4.yaml
View File

@@ -87,6 +87,7 @@ climate:
id: tuya_climate id: tuya_climate
switch_datapoint: 1 switch_datapoint: 1
target_temperature_datapoint: 3 target_temperature_datapoint: 3
temperature_multiplier: 0.5
switch: switch:
- platform: tuya - platform: tuya