mirror of
https://github.com/esphome/esphome.git
synced 2025-07-25 20:56:38 +00:00
[remote_receiver] Filtering fixes (#7777)
Co-authored-by: Jonathan Swoboda <jonathan.swoboda>
This commit is contained in:
parent
0c3daab649
commit
31ed1eb6f0
@ -208,7 +208,6 @@ void RemoteReceiverComponent::loop() {
|
|||||||
this->store_.buffer_read = next_read;
|
this->store_.buffer_read = next_read;
|
||||||
|
|
||||||
if (!this->temp_.empty()) {
|
if (!this->temp_.empty()) {
|
||||||
this->temp_.push_back(-this->idle_us_);
|
|
||||||
this->call_listeners_dumpers_();
|
this->call_listeners_dumpers_();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -219,11 +218,9 @@ void RemoteReceiverComponent::loop() {
|
|||||||
this->decode_rmt_(item, len / sizeof(rmt_item32_t));
|
this->decode_rmt_(item, len / sizeof(rmt_item32_t));
|
||||||
vRingbufferReturnItem(this->ringbuf_, item);
|
vRingbufferReturnItem(this->ringbuf_, item);
|
||||||
|
|
||||||
if (this->temp_.empty())
|
if (!this->temp_.empty()) {
|
||||||
return;
|
this->call_listeners_dumpers_();
|
||||||
|
}
|
||||||
this->temp_.push_back(-this->idle_us_);
|
|
||||||
this->call_listeners_dumpers_();
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -234,6 +231,7 @@ void RemoteReceiverComponent::decode_rmt_(rmt_symbol_word_t *item, size_t item_c
|
|||||||
void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t item_count) {
|
void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t item_count) {
|
||||||
#endif
|
#endif
|
||||||
bool prev_level = false;
|
bool prev_level = false;
|
||||||
|
bool idle_level = false;
|
||||||
uint32_t prev_length = 0;
|
uint32_t prev_length = 0;
|
||||||
this->temp_.clear();
|
this->temp_.clear();
|
||||||
int32_t multiplier = this->pin_->is_inverted() ? -1 : 1;
|
int32_t multiplier = this->pin_->is_inverted() ? -1 : 1;
|
||||||
@ -266,7 +264,7 @@ void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t item_count)
|
|||||||
} else if ((bool(item[i].level0) == prev_level) || (item[i].duration0 < filter_ticks)) {
|
} else if ((bool(item[i].level0) == prev_level) || (item[i].duration0 < filter_ticks)) {
|
||||||
prev_length += item[i].duration0;
|
prev_length += item[i].duration0;
|
||||||
} else {
|
} else {
|
||||||
if (prev_length > 0) {
|
if (prev_length >= filter_ticks) {
|
||||||
if (prev_level) {
|
if (prev_level) {
|
||||||
this->temp_.push_back(this->to_microseconds_(prev_length) * multiplier);
|
this->temp_.push_back(this->to_microseconds_(prev_length) * multiplier);
|
||||||
} else {
|
} else {
|
||||||
@ -276,6 +274,7 @@ void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t item_count)
|
|||||||
prev_level = bool(item[i].level0);
|
prev_level = bool(item[i].level0);
|
||||||
prev_length = item[i].duration0;
|
prev_length = item[i].duration0;
|
||||||
}
|
}
|
||||||
|
idle_level = !bool(item[i].level0);
|
||||||
|
|
||||||
if (item[i].duration1 == 0u) {
|
if (item[i].duration1 == 0u) {
|
||||||
// EOF, sometimes garbage follows, break early
|
// EOF, sometimes garbage follows, break early
|
||||||
@ -283,7 +282,7 @@ void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t item_count)
|
|||||||
} else if ((bool(item[i].level1) == prev_level) || (item[i].duration1 < filter_ticks)) {
|
} else if ((bool(item[i].level1) == prev_level) || (item[i].duration1 < filter_ticks)) {
|
||||||
prev_length += item[i].duration1;
|
prev_length += item[i].duration1;
|
||||||
} else {
|
} else {
|
||||||
if (prev_length > 0) {
|
if (prev_length >= filter_ticks) {
|
||||||
if (prev_level) {
|
if (prev_level) {
|
||||||
this->temp_.push_back(this->to_microseconds_(prev_length) * multiplier);
|
this->temp_.push_back(this->to_microseconds_(prev_length) * multiplier);
|
||||||
} else {
|
} else {
|
||||||
@ -293,14 +292,22 @@ void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t item_count)
|
|||||||
prev_level = bool(item[i].level1);
|
prev_level = bool(item[i].level1);
|
||||||
prev_length = item[i].duration1;
|
prev_length = item[i].duration1;
|
||||||
}
|
}
|
||||||
|
idle_level = !bool(item[i].level1);
|
||||||
}
|
}
|
||||||
if (prev_length > 0) {
|
if (prev_length >= filter_ticks && prev_level != idle_level) {
|
||||||
if (prev_level) {
|
if (prev_level) {
|
||||||
this->temp_.push_back(this->to_microseconds_(prev_length) * multiplier);
|
this->temp_.push_back(this->to_microseconds_(prev_length) * multiplier);
|
||||||
} else {
|
} else {
|
||||||
this->temp_.push_back(-int32_t(this->to_microseconds_(prev_length)) * multiplier);
|
this->temp_.push_back(-int32_t(this->to_microseconds_(prev_length)) * multiplier);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!this->temp_.empty()) {
|
||||||
|
if (idle_level) {
|
||||||
|
this->temp_.push_back(this->idle_us_ * multiplier);
|
||||||
|
} else {
|
||||||
|
this->temp_.push_back(-int32_t(this->idle_us_) * multiplier);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace remote_receiver
|
} // namespace remote_receiver
|
||||||
|
Loading…
x
Reference in New Issue
Block a user