thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-01 18:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Break the Tuya set_datapoint_value method into separate methods per datapoint type (#2059)

Browse Source 
Co-authored-by: Chris Nussbaum <chris.nussbaum@protolabs.com>
Co-authored-by: Trevor North <trevor@freedisc.co.uk>
This commit is contained in:
Chris Nussbaum
2021-08-10 14:44:31 -05:00
committed by GitHub
parent 1771e673d2
commit 6144ce1fe0
6 changed files with 83 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/tuya/light/tuya_light.cpp
+6 -6
View File
@@ -31,7 +31,7 @@ void TuyaLight::setup() {
});
}
if (min_value_datapoint_id_.has_value()) {
parent_->set_datapoint_value(*this->min_value_datapoint_id_, this->min_value_);
parent_->set_integer_datapoint_value(*this->min_value_datapoint_id_, this->min_value_);
}
}
@@ -66,9 +66,9 @@ void TuyaLight::write_state(light::LightState *state) {
if (brightness == 0.0f) {
// turning off, first try via switch (if exists), then dimmer
if (switch_id_.has_value()) {
parent_->set_datapoint_value(*this->switch_id_, false);
parent_->set_boolean_datapoint_value(*this->switch_id_, false);
} else if (dimmer_id_.has_value()) {
parent_->set_datapoint_value(*this->dimmer_id_, 0);
parent_->set_integer_datapoint_value(*this->dimmer_id_, 0);
}
return;
}
@@ -78,17 +78,17 @@ void TuyaLight::write_state(light::LightState *state) {
static_cast<uint32_t>(this->color_temperature_max_value_ *
(state->current_values.get_color_temperature() - this->cold_white_temperature_) /
(this->warm_white_temperature_ - this->cold_white_temperature_));
parent_->set_datapoint_value(*this->color_temperature_id_, color_temp_int);
parent_->set_integer_datapoint_value(*this->color_temperature_id_, color_temp_int);
}
auto brightness_int = static_cast<uint32_t>(brightness * this->max_value_);
brightness_int = std::max(brightness_int, this->min_value_);
if (this->dimmer_id_.has_value()) {
parent_->set_datapoint_value(*this->dimmer_id_, brightness_int);
parent_->set_integer_datapoint_value(*this->dimmer_id_, brightness_int);
}
if (this->switch_id_.has_value()) {
parent_->set_datapoint_value(*this->switch_id_, true);
parent_->set_boolean_datapoint_value(*this->switch_id_, true);
}
}