Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-10 09:17:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix #1940: Implement speed_count in TuyaFan (#1654)

Browse source 
Co-authored-by: Frank Riley <fhriley@gmail.com>
This commit is contained in:
0x0a11c0de 2021-05-03 19:11:24 -07:00 committed by GitHub
parent dd4fb85170
commit 98f0d75180
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
esphome/components/tuya/fan/__init__.py
View file

@ -1,7 +1,7 @@
from esphome.components import fan from esphome.components import fan
import esphome.config_validation as cv import esphome.config_validation as cv
import esphome.codegen as cg import esphome.codegen as cg
from esphome.const import CONF_OUTPUT_ID, CONF_SWITCH_DATAPOINT from esphome.const import CONF_OUTPUT_ID, CONF_SPEED_COUNT, CONF_SWITCH_DATAPOINT
from .. import tuya_ns, CONF_TUYA_ID, Tuya from .. import tuya_ns, CONF_TUYA_ID, Tuya
DEPENDENCIES = ["tuya"] DEPENDENCIES = ["tuya"]
@ -19,6 +19,7 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_OSCILLATION_DATAPOINT): cv.uint8_t, cv.Optional(CONF_OSCILLATION_DATAPOINT): cv.uint8_t,
cv.Optional(CONF_SPEED_DATAPOINT): cv.uint8_t, cv.Optional(CONF_SPEED_DATAPOINT): cv.uint8_t,
cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t, cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
cv.Optional(CONF_SPEED_COUNT, default=3): cv.int_range(min=1, max=256),
} }
).extend(cv.COMPONENT_SCHEMA), ).extend(cv.COMPONENT_SCHEMA),
cv.has_at_least_one_key(CONF_SPEED_DATAPOINT, CONF_SWITCH_DATAPOINT), cv.has_at_least_one_key(CONF_SPEED_DATAPOINT, CONF_SWITCH_DATAPOINT),
@ -26,13 +27,13 @@ CONFIG_SCHEMA = cv.All(
def to_code(config): def to_code(config):
var = cg.new_Pvariable(config[CONF_OUTPUT_ID]) parent = yield cg.get_variable(config[CONF_TUYA_ID])
yield cg.register_component(var, config) state = yield fan.create_fan_state(config)
paren = yield cg.get_variable(config[CONF_TUYA_ID]) var = cg.new_Pvariable(
fan_ = yield fan.create_fan_state(config) config[CONF_OUTPUT_ID], parent, state, config[CONF_SPEED_COUNT]
cg.add(var.set_tuya_parent(paren)) )
cg.add(var.set_fan(fan_)) yield cg.register_component(var, config)
if CONF_SPEED_DATAPOINT in config: if CONF_SPEED_DATAPOINT in config:
cg.add(var.set_speed_id(config[CONF_SPEED_DATAPOINT])) cg.add(var.set_speed_id(config[CONF_SPEED_DATAPOINT]))

12
esphome/components/tuya/fan/tuya_fan.cpp
View file

@ -8,18 +8,15 @@ namespace tuya {
static const char *TAG = "tuya.fan"; static const char *TAG = "tuya.fan";
void TuyaFan::setup() { void TuyaFan::setup() {
auto traits = fan::FanTraits(this->oscillation_id_.has_value(), this->speed_id_.has_value(), false, 3); auto traits =
fan::FanTraits(this->oscillation_id_.has_value(), this->speed_id_.has_value(), false, this->speed_count_);
this->fan_->set_traits(traits); this->fan_->set_traits(traits);
if (this->speed_id_.has_value()) { if (this->speed_id_.has_value()) {
this->parent_->register_listener(*this->speed_id_, [this](TuyaDatapoint datapoint) { this->parent_->register_listener(*this->speed_id_, [this](TuyaDatapoint datapoint) {
auto call = this->fan_->make_call(); auto call = this->fan_->make_call();
if (datapoint.value_enum == 0x0) if (datapoint.value_enum < this->speed_count_)
call.set_speed(1); call.set_speed(datapoint.value_enum + 1);
else if (datapoint.value_enum == 0x1)
call.set_speed(2);
else if (datapoint.value_enum == 0x2)
call.set_speed(3);
else else
ESP_LOGCONFIG(TAG, "Speed has invalid value %d", datapoint.value_enum); ESP_LOGCONFIG(TAG, "Speed has invalid value %d", datapoint.value_enum);
ESP_LOGD(TAG, "MCU reported speed of: %d", datapoint.value_enum); ESP_LOGD(TAG, "MCU reported speed of: %d", datapoint.value_enum);
@ -47,6 +44,7 @@ void TuyaFan::setup() {
void TuyaFan::dump_config() { void TuyaFan::dump_config() {
ESP_LOGCONFIG(TAG, "Tuya Fan:"); ESP_LOGCONFIG(TAG, "Tuya Fan:");
ESP_LOGCONFIG(TAG, " Speed count %d", this->speed_count_);
if (this->speed_id_.has_value()) if (this->speed_id_.has_value())
ESP_LOGCONFIG(TAG, " Speed has datapoint ID %u", *this->speed_id_); ESP_LOGCONFIG(TAG, " Speed has datapoint ID %u", *this->speed_id_);
if (this->switch_id_.has_value()) if (this->switch_id_.has_value())

4
esphome/components/tuya/fan/tuya_fan.h
View file

@ -9,13 +9,12 @@ namespace tuya {
class TuyaFan : public Component { class TuyaFan : public Component {
public: public:
TuyaFan(Tuya *parent, fan::FanState *fan, int speed_count) : parent_(parent), fan_(fan), speed_count_(speed_count) {}
void setup() override; void setup() override;
void dump_config() override; void dump_config() override;
void set_speed_id(uint8_t speed_id) { this->speed_id_ = speed_id; } void set_speed_id(uint8_t speed_id) { this->speed_id_ = speed_id; }
void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; } void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }
void set_oscillation_id(uint8_t oscillation_id) { this->oscillation_id_ = oscillation_id; } void set_oscillation_id(uint8_t oscillation_id) { this->oscillation_id_ = oscillation_id; }
void set_fan(fan::FanState *fan) { this->fan_ = fan; }
void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
void write_state(); void write_state();
protected: protected:
@ -28,6 +27,7 @@ class TuyaFan : public Component {
optional<uint8_t> switch_id_{}; optional<uint8_t> switch_id_{};
optional<uint8_t> oscillation_id_{}; optional<uint8_t> oscillation_id_{};
fan::FanState *fan_; fan::FanState *fan_;
int speed_count_{};
}; };
} // namespace tuya } // namespace tuya