Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-01-07 13:21:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

- fix publishing state

Browse source 
- use constants for open and close posititions
This commit is contained in:
klaudiusz223 2023-02-02 22:33:16 +01:00
parent 12dd2cbcd5
commit 44b071dce7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
esphome/components/time_based_tilt/time_based_tilt_cover.cpp
View file

@ -74,6 +74,7 @@ void TimeBasedTiltCover::loop() {
this->fsm_state_ = STATE_IDLE; this->fsm_state_ = STATE_IDLE;
this->last_operation_ = this->current_operation; this->last_operation_ = this->current_operation;
this->current_operation = COVER_OPERATION_IDLE; this->current_operation = COVER_OPERATION_IDLE;
this->publish_state();
return; return;
} }
@ -130,12 +131,12 @@ void TimeBasedTiltCover::loop() {
if (this->target_position_ == TARGET_NONE && this->is_at_target_tilt_()){ // only tilting w/o position change if (this->target_position_ == TARGET_NONE && this->is_at_target_tilt_()){ // only tilting w/o position change
this->last_recompute_time_ = now; this->last_recompute_time_ = now;
this->target_tilt_ = TARGET_NONE; this->target_tilt_ = TARGET_NONE;
this->publish_state();
this->last_publish_time_= now; this->last_publish_time_= now;
if ( ( this->position == 0.0f && this->tilt == 0.0f ) || ( this->position == 1.0f && this->tilt == 1.0f ) ) // start recalibration if ( ( this->position == COVER_CLOSED && this->tilt == COVER_CLOSED ) || ( this->position == COVER_OPEN && this->tilt == COVER_OPEN ) ) // start recalibration
{ {
this->fsm_state_ = STATE_CALIBRATING; this->fsm_state_ = STATE_CALIBRATING;
this->publish_state(false);
} else { } else {
this->fsm_state_ = STATE_STOPPING; this->fsm_state_ = STATE_STOPPING;
} }
@ -143,7 +144,7 @@ void TimeBasedTiltCover::loop() {
return; // only tilting w/o position change so no need to recompute position return; // only tilting w/o position change so no need to recompute position
} }
if ( now - this->last_publish_time_ > 300 ){ if ( now - this->last_publish_time_ > ( ( tilt_time / 5 ) > 1000 ? 1000 : ( tilt_time / 5 ) ) ){
this->publish_state(false); this->publish_state(false);
this->last_publish_time_= now; this->last_publish_time_= now;
} }
@ -165,12 +166,12 @@ void TimeBasedTiltCover::loop() {
if (this->is_at_target_position_()){ if (this->is_at_target_position_()){
this->last_recompute_time_ = now; this->last_recompute_time_ = now;
this->target_position_ = TARGET_NONE; this->target_position_ = TARGET_NONE;
this->publish_state();
this->last_publish_time_= now; this->last_publish_time_= now;
if ( ( this->position == 0.0f && this->tilt == 0.0f ) || ( this->position == 1.0f && this->tilt == 1.0f ) ) if ( ( this->position == COVER_CLOSED && this->tilt == COVER_CLOSED ) || ( this->position == COVER_OPEN && this->tilt == COVER_OPEN ) )
{ {
this->fsm_state_ = STATE_CALIBRATING; this->fsm_state_ = STATE_CALIBRATING;
this->publish_state(false);
} else { } else {
this->fsm_state_ = STATE_STOPPING; this->fsm_state_ = STATE_STOPPING;
} }
@ -230,12 +231,12 @@ void TimeBasedTiltCover::control(const CoverCall &call) {
} else if (call.get_position().has_value()) { } else if (call.get_position().has_value()) {
auto pos = *call.get_position(); auto pos = *call.get_position();
if ( pos == 0.0f && this->position == 0.0f && this->tilt != 0.0f ){ if ( pos == COVER_CLOSED && this->position == COVER_CLOSED && this->tilt != COVER_CLOSED ){
pos = TARGET_NONE; pos = TARGET_NONE;
this->target_tilt_ = 0.0f; this->target_tilt_ = COVER_CLOSED;
} else if ( pos == 1.0f && this->position == 1.0f && this->tilt != 1.0f ){ } else if ( pos == COVER_OPEN && this->position == COVER_OPEN && this->tilt != COVER_OPEN ){
pos = TARGET_NONE; pos = TARGET_NONE;
this->target_tilt_ = 1.0f; this->target_tilt_ = COVER_OPEN;
} else if ( this->round_position(pos) == this->round_position(this->position) ){ } else if ( this->round_position(pos) == this->round_position(this->position) ){
pos = TARGET_NONE; pos = TARGET_NONE;
} }
@ -281,7 +282,6 @@ void TimeBasedTiltCover::control(const CoverCall &call) {
if (call.get_toggle().has_value()) { if (call.get_toggle().has_value()) {
if (this->current_operation != COVER_OPERATION_IDLE) { if (this->current_operation != COVER_OPERATION_IDLE) {
this->publish_state();
this->fsm_state_ = STATE_STOPPING; this->fsm_state_ = STATE_STOPPING;
this->target_position_ = TARGET_NONE; this->target_position_ = TARGET_NONE;
this->target_tilt_ = TARGET_NONE; this->target_tilt_ = TARGET_NONE;