Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-23 07:28:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

More Tuya MCU robustness (#2080)

Browse source
This commit is contained in:
John K. Luebs 2021-07-27 21:01:15 -05:00 committed by Jesse Hills
parent e43dcded62
commit bfac6607d1
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
esphome/components/tuya/tuya.cpp
View file

@ -7,7 +7,7 @@ namespace esphome {
namespace tuya { namespace tuya {
static const char *const TAG = "tuya"; static const char *const TAG = "tuya";
static const int COMMAND_DELAY = 50; static const int COMMAND_DELAY = 10;
static const int RECEIVE_TIMEOUT = 300; static const int RECEIVE_TIMEOUT = 300;
void Tuya::setup() { void Tuya::setup() {
@ -114,6 +114,8 @@ void Tuya::handle_char_(uint8_t c) {
this->rx_message_.push_back(c); this->rx_message_.push_back(c);
if (!this->validate_message_()) { if (!this->validate_message_()) {
this->rx_message_.clear(); this->rx_message_.clear();
} else {
this->last_rx_char_timestamp_ = millis();
} }
} }
@ -357,7 +359,12 @@ void Tuya::send_raw_command_(TuyaCommand command) {
} }
void Tuya::process_command_queue_() { void Tuya::process_command_queue_() {
uint32_t delay = millis() - this->last_command_timestamp_; uint32_t now = millis();
uint32_t delay = now - this->last_command_timestamp_;
if (now - this->last_rx_char_timestamp_ > RECEIVE_TIMEOUT) {
this->rx_message_.clear();
}
if (this->expected_response_.has_value() && delay > RECEIVE_TIMEOUT) { if (this->expected_response_.has_value() && delay > RECEIVE_TIMEOUT) {
this->expected_response_.reset(); this->expected_response_.reset();

1
esphome/components/tuya/tuya.h
View file

@ -107,6 +107,7 @@ class Tuya : public Component, public uart::UARTDevice {
int gpio_status_ = -1; int gpio_status_ = -1;
int gpio_reset_ = -1; int gpio_reset_ = -1;
uint32_t last_command_timestamp_ = 0; uint32_t last_command_timestamp_ = 0;
uint32_t last_rx_char_timestamp_ = 0;
std::string product_ = ""; std::string product_ = "";
std::vector<TuyaDatapointListener> listeners_; std::vector<TuyaDatapointListener> listeners_;
std::vector<TuyaDatapoint> datapoints_; std::vector<TuyaDatapoint> datapoints_;