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

Revert ExpiringCallbacks change.

This commit is contained in:
Marius Muja 2024-01-20 19:56:19 -08:00
parent 9ec34310d2
commit 9c15db6ee1
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/ratgdo/ratgdo.cpp
View File

@ -181,12 +181,7 @@ namespace ratgdo {
} }
this->door_state = door_state; this->door_state = door_state;
auto now = millis(); defer([=]() { this->on_door_state_.trigger(door_state); });
if (!this->on_door_state_.is_expired(now)) {
defer([=]() { this->on_door_state_.trigger(now, door_state); });
} else {
this->on_door_state_.clear();
}
} }
void RATGDOComponent::received(const LearnState learn_state) void RATGDOComponent::received(const LearnState learn_state)
@ -451,7 +446,7 @@ namespace ratgdo {
if (*this->door_state == DoorState::OPENING) { if (*this->door_state == DoorState::OPENING) {
// have to stop door first, otherwise close command is ignored // have to stop door first, otherwise close command is ignored
this->door_action(DoorAction::STOP); this->door_action(DoorAction::STOP);
this->on_door_state_(millis() + 2000, [=](DoorState s) { this->on_door_state_([=](DoorState s) {
if (s == DoorState::STOPPED) { if (s == DoorState::STOPPED) {
this->door_action(DoorAction::CLOSE); this->door_action(DoorAction::CLOSE);
} else { } else {
@ -495,7 +490,7 @@ namespace ratgdo {
{ {
if (*this->door_state == DoorState::OPENING || *this->door_state == DoorState::CLOSING) { if (*this->door_state == DoorState::OPENING || *this->door_state == DoorState::CLOSING) {
this->door_action(DoorAction::STOP); this->door_action(DoorAction::STOP);
this->on_door_state_(millis() + 2000, [=](DoorState s) { this->on_door_state_([=](DoorState s) {
if (s == DoorState::STOPPED) { if (s == DoorState::STOPPED) {
this->door_move_to_position(position); this->door_move_to_position(position);
} else { } else {

2
components/ratgdo/ratgdo.h
View File

@ -83,7 +83,7 @@ namespace ratgdo {
observable<MotionState> motion_state { MotionState::UNKNOWN }; observable<MotionState> motion_state { MotionState::UNKNOWN };
observable<LearnState> learn_state { LearnState::UNKNOWN }; observable<LearnState> learn_state { LearnState::UNKNOWN };
ExpiringCallbacks<void(DoorState)> on_door_state_; OnceCallbacks<void(DoorState)> on_door_state_;
observable<bool> sync_failed { false }; observable<bool> sync_failed { false };