Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-22 11:47:30 +01:00
Code Issues Projects Releases Wiki Activity

[he60r] Don't publish state unless it has changed. [BUGFIX] (#6869)

Browse Source
This commit is contained in:
Clyde Stubbs 2024-06-12 11:09:20 +10:00 committed by GitHub
parent 13fabf1cd8
commit e2784d077d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
esphome/components/he60r/he60r.cpp
View File

@ -56,7 +56,7 @@ void HE60rCover::endstop_reached_(CoverOperation operation) {
this->position = new_position; this->position = new_position;
this->current_operation = COVER_OPERATION_IDLE; this->current_operation = COVER_OPERATION_IDLE;
if (this->last_command_ == operation) { if (this->last_command_ == operation) {
float dur = (now - this->start_dir_time_) / 1e3f; float dur = (float) (now - this->start_dir_time_) / 1e3f;
ESP_LOGD(TAG, "'%s' - %s endstop reached. Took %.1fs.", this->name_.c_str(), ESP_LOGD(TAG, "'%s' - %s endstop reached. Took %.1fs.", this->name_.c_str(),
operation == COVER_OPERATION_OPENING ? "Open" : "Close", dur); operation == COVER_OPERATION_OPENING ? "Open" : "Close", dur);
} }
@ -69,7 +69,6 @@ void HE60rCover::set_current_operation_(cover::CoverOperation operation) {
this->current_operation = operation; this->current_operation = operation;
if (operation != COVER_OPERATION_IDLE) if (operation != COVER_OPERATION_IDLE)
this->last_recompute_time_ = millis(); this->last_recompute_time_ = millis();
this->publish_state();
} }
} }
@ -129,7 +128,7 @@ void HE60rCover::update_() {
if (this->toggles_needed_ != 0) { if (this->toggles_needed_ != 0) {
if ((this->counter_++ & 0x3) == 0) { if ((this->counter_++ & 0x3) == 0) {
this->toggles_needed_--; this->toggles_needed_--;
ESP_LOGD(TAG, "Writing byte 0x30, still needed=%" PRIu32, this->toggles_needed_); ESP_LOGD(TAG, "Writing byte 0x30, still needed=%u", this->toggles_needed_);
this->write_byte(TOGGLE_BYTE); this->write_byte(TOGGLE_BYTE);
} else { } else {
this->write_byte(QUERY_BYTE); this->write_byte(QUERY_BYTE);
@ -235,31 +234,28 @@ void HE60rCover::recompute_position_() {
return; return;
const uint32_t now = millis(); const uint32_t now = millis();
float dir;
float action_dur;
switch (this->current_operation) {
case COVER_OPERATION_OPENING:
dir = 1.0f;
action_dur = this->open_duration_;
break;
case COVER_OPERATION_CLOSING:
dir = -1.0f;
action_dur = this->close_duration_;
break;
default:
return;
}
if (now > this->last_recompute_time_) { if (now > this->last_recompute_time_) {
auto diff = now - last_recompute_time_; auto diff = (unsigned) (now - last_recompute_time_);
auto delta = dir * diff / action_dur; float delta;
switch (this->current_operation) {
case COVER_OPERATION_OPENING:
delta = (float) diff / (float) this->open_duration_;
break;
case COVER_OPERATION_CLOSING:
delta = -(float) diff / (float) this->close_duration_;
break;
default:
return;
}
// make sure our guesstimate never reaches full open or close. // make sure our guesstimate never reaches full open or close.
this->position = clamp(delta + this->position, COVER_CLOSED + 0.01f, COVER_OPEN - 0.01f); auto new_position = clamp(delta + this->position, COVER_CLOSED + 0.01f, COVER_OPEN - 0.01f);
ESP_LOGD(TAG, "Recompute %dms, dir=%f, action_dur=%f, delta=%f, pos=%f", (int) diff, dir, action_dur, delta, ESP_LOGD(TAG, "Recompute %ums, dir=%u, delta=%f, pos=%f", diff, this->current_operation, delta, new_position);
this->position);
this->last_recompute_time_ = now; this->last_recompute_time_ = now;
this->publish_state(); if (this->position != new_position) {
this->position = new_position;
this->publish_state();
}
} }
} }

7
esphome/components/he60r/he60r.h
View File

@ -25,15 +25,14 @@ class HE60rCover : public cover::Cover, public Component, public uart::UARTDevic
void control(const cover::CoverCall &call) override; void control(const cover::CoverCall &call) override;
bool is_at_target_() const; bool is_at_target_() const;
void start_direction_(cover::CoverOperation dir); void start_direction_(cover::CoverOperation dir);
void update_operation_(cover::CoverOperation dir);
void endstop_reached_(cover::CoverOperation operation); void endstop_reached_(cover::CoverOperation operation);
void recompute_position_(); void recompute_position_();
void set_current_operation_(cover::CoverOperation operation); void set_current_operation_(cover::CoverOperation operation);
void process_rx_(uint8_t data); void process_rx_(uint8_t data);
uint32_t open_duration_{0}; unsigned open_duration_{0};
uint32_t close_duration_{0}; unsigned close_duration_{0};
uint32_t toggles_needed_{0}; unsigned toggles_needed_{0};
cover::CoverOperation next_direction_{cover::COVER_OPERATION_IDLE}; cover::CoverOperation next_direction_{cover::COVER_OPERATION_IDLE};
cover::CoverOperation last_command_{cover::COVER_OPERATION_IDLE}; cover::CoverOperation last_command_{cover::COVER_OPERATION_IDLE};
uint32_t last_recompute_time_{0}; uint32_t last_recompute_time_{0};