kenjreno
/
esphome-ratgdo
mirror of https://github.com/ratgdo/esphome-ratgdo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove lean polling

This commit is contained in:
Marius Muja 2024-01-18 18:13:28 -08:00
parent 7c5ee69418
commit 181b563b96
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/ratgdo/ratgdo.cpp
View File

@ -190,6 +190,15 @@ namespace ratgdo {
void RATGDOComponent::received(const LearnState learn_state)
{
ESP_LOGD(TAG, "Learn state=%s", LearnState_to_string(learn_state));
if (*this->learn_state == learn_state) {
return;
}
if (learn_state == LearnState::INACTIVE) {
this->query_paired_devices();
}
this->learn_state = learn_state;
}

26
components/ratgdo/secplus2.cpp
View File

@ -238,7 +238,6 @@ namespace secplus2 {
void Secplus2::activate_learn()
{
// Send LEARN with nibble = 0 then nibble = 1 to mimic wall control learn button
this->learn_poll_status_ = true;
this->send_command(Command{CommandType::LEARN, 0});
this->scheduler_->set_timeout(this->ratgdo_, "", 150, [=] { this->send_command(Command{CommandType::LEARN, 1}); });
this->scheduler_->set_timeout(this->ratgdo_, "", 500, [=] { this->query_status(); });
@ -381,24 +380,7 @@ namespace secplus2 {
this->ratgdo_->received(to_LockState((cmd.byte2 & 1), LockState::UNKNOWN));
// ESP_LOGD(TAG, "Obstruction: reading from byte2, bit2, status=%d", ((byte2 >> 2) & 1) == 1);
this->ratgdo_->received(to_ObstructionState((cmd.byte1 >> 6) & 1, ObstructionState::UNKNOWN));
auto learn_state = to_LearnState((cmd.byte2 >> 5) & 1, LearnState::UNKNOWN);
if (this->learn_state_ != learn_state) {
ESP_LOG1(TAG, "Learn state handle: %d", (int)this->learn_poll_status_);
if (learn_state == LearnState::ACTIVE && this->learn_poll_status_) {
this->scheduler_->set_interval(this->ratgdo_, "learn_poll", 1000, [=] {
this->query_status();
});
} else {
this->scheduler_->cancel_interval(this->ratgdo_, "learn_poll");
this->learn_poll_status_ = true;
}
if (learn_state == LearnState::INACTIVE) {
this->query_paired_devices();
}
this->learn_state_ = learn_state;
}
this->ratgdo_->received(learn_state);
this->ratgdo_->received(to_LearnState((cmd.byte2 >> 5) & 1, LearnState::UNKNOWN));
}
else if (cmd.type == CommandType::LIGHT) {
this->ratgdo_->received(to_LightAction(cmd.nibble, LightAction::UNKNOWN));
@ -435,12 +417,6 @@ namespace secplus2 {
}
this->ratgdo_->received(pdc);
}
else if (cmd.type == CommandType::LEARN) {
if (cmd.nibble == 1) { // LEARN sent from wall control, it will poll status every second.
// otherwise if ratgdo or gdo initiated ratgdo needs to poll
this->learn_poll_status_ = false;
}
}
else if (cmd.type == CommandType::BATTERY_STATUS) {
this->ratgdo_->received(to_BatteryState(cmd.byte1, BatteryState::UNKNOWN));
}

1
components/ratgdo/secplus2.h
View File

@ -120,7 +120,6 @@ namespace secplus2 {
optional<Command> decode_packet(const WirePacket& packet) const;
LearnState learn_state_ { LearnState::UNKNOWN };
bool learn_poll_status_;
observable<uint32_t> rolling_code_counter_ { 0 };
uint64_t client_id_ { 0x539 };