Upstream
/
esphome
mirror of https://github.com/esphome/esphome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleaning up

This commit is contained in:
klaudiusz223 2024-01-28 17:02:18 +01:00
parent 075ae88c87
commit 6ce030e66f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
esphome/components/time_based_tilt/time_based_tilt_cover.cpp
View File

@ -77,11 +77,11 @@ void TimeBasedTiltCover::loop() {
if (this->fsm_state_ == STATE_STOPPING) {
this->stop_trigger_->trigger();
if (this->current_operation != COVER_OPERATION_IDLE) {
this->interlocked_time = millis();
this->interlocked_direction =
this->interlocked_time_ = millis();
this->interlocked_direction_ =
this->current_operation == COVER_OPERATION_CLOSING ? COVER_OPERATION_OPENING : COVER_OPERATION_CLOSING;
} else {
this->interlocked_direction = COVER_OPERATION_IDLE;
this->interlocked_direction_ = COVER_OPERATION_IDLE;
}
this->fsm_state_ = STATE_IDLE;
this->last_operation_ = this->current_operation;
@ -98,8 +98,8 @@ void TimeBasedTiltCover::loop() {
this->current_operation = this->compute_direction(this->target_tilt_, this->tilt);
}
// interlocking support
if (this->current_operation == this->interlocked_direction &&
now - this->interlocked_time < this->interlock_wait_time_)
if (this->current_operation == this->interlocked_direction_ &&
now - this->interlocked_time_ < this->interlock_wait_time_)
return;
Trigger<> *trig = this->current_operation == COVER_OPERATION_CLOSING ? this->close_trigger_ : this->open_trigger_;
@ -120,11 +120,11 @@ void TimeBasedTiltCover::loop() {
auto inertia_time =
this->current_operation == COVER_OPERATION_CLOSING ? this->inertia_close_time_ : this->inertia_open_time_;
if (inertia_time > 0 && this->inertia * dir_factor < 0.5f) { // inertia before movement
if (inertia_time > 0 && this->inertia_ * dir_factor < 0.5f) { // inertia before movement
auto inertia_step = dir_factor * travel_time / inertia_time;
this->inertia += inertia_step;
auto rest = this->inertia - clamp(this->inertia, -0.5f, 0.5f);
this->inertia = clamp(this->inertia, -0.5f, 0.5f);
this->inertia_ += inertia_step;
auto rest = this->inertia_ - clamp(this->inertia_, -0.5f, 0.5f);
this->inertia_ = clamp(this->inertia_, -0.5f, 0.5f);
if (!rest)
return; // the movement has not yet actually started

6
esphome/components/time_based_tilt/time_based_tilt_cover.h
View File

@ -59,13 +59,13 @@ class TimeBasedTiltCover : public cover::Cover, public Component {
uint32_t last_publish_time_{0};
float target_position_{TARGET_NONE};
float target_tilt_{TARGET_NONE};
float inertia{0.0f};
float inertia_{0.0f};
bool has_built_in_endstop_{false};
bool assumed_state_{false};
cover::CoverOperation last_operation_{cover::COVER_OPERATION_OPENING};
State fsm_state_{STATE_IDLE};
cover::CoverOperation interlocked_direction{cover::COVER_OPERATION_IDLE};
uint32_t interlocked_time{0};
cover::CoverOperation interlocked_direction_{cover::COVER_OPERATION_IDLE};
uint32_t interlocked_time_{0};
};
} // namespace time_based_tilt