Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-02 13:24:15 +01:00
Code Issues Projects Releases Wiki Activity

Remove merge conflict extra code

Browse Source
This commit is contained in:
Trent Houliston 2024-05-17 12:54:42 +10:00
parent 1d477329a2
commit c4c34bbe25
No known key found for this signature in database
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/pulse_meter/pulse_meter_sensor.cpp
View File

@ -34,8 +34,6 @@ void PulseMeterSensor::setup() {
} }
void PulseMeterSensor::loop() { void PulseMeterSensor::loop() {
const uint32_t now = micros();
// Reset the count in get before we pass it back to the ISR as set // Reset the count in get before we pass it back to the ISR as set
this->get_->count_ = 0; this->get_->count_ = 0;
@ -59,19 +57,7 @@ void PulseMeterSensor::loop() {
std::swap(this->set_, this->get_); std::swap(this->set_, this->get_);
} }
// If an edge was peeked, repay the debt const uint32_t now = micros();
if (this->peeked_edge_ && this->get_->count_ > 0) {
this->peeked_edge_ = false;
this->get_->count_--;
}
// If there is an unprocessed edge, and filter_us_ has passed since, count this edge early
if (this->get_->last_rising_edge_us_ != this->get_->last_detected_edge_us_ &&
now - this->get_->last_rising_edge_us_ >= this->filter_us_) {
this->peeked_edge_ = true;
this->get_->last_detected_edge_us_ = this->get_->last_rising_edge_us_;
this->get_->count_++;
}
// If an edge was peeked, repay the debt // If an edge was peeked, repay the debt
if (this->peeked_edge_ && this->get_->count_ > 0) { if (this->peeked_edge_ && this->get_->count_ > 0) {