From d54b4e7c4466487b23c54c0e5f72892bdaed0a00 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Saura <CarlosGS@users.noreply.github.com>
Date: Mon, 1 Nov 2021 20:27:57 +0100
Subject: [PATCH] Fix for noise in pulse_counter and duty_cycle components
 (#2646)

---
 .../duty_cycle/duty_cycle_sensor.cpp          | 22 +++++++++----------
 .../components/duty_cycle/duty_cycle_sensor.h |  2 +-
 .../pulse_counter/pulse_counter_sensor.cpp    | 12 ++++++----
 .../pulse_counter/pulse_counter_sensor.h      |  3 ++-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/esphome/components/duty_cycle/duty_cycle_sensor.cpp b/esphome/components/duty_cycle/duty_cycle_sensor.cpp
index 3d7f731d5d..aed22312a7 100644
--- a/esphome/components/duty_cycle/duty_cycle_sensor.cpp
+++ b/esphome/components/duty_cycle/duty_cycle_sensor.cpp
@@ -12,7 +12,6 @@ void DutyCycleSensor::setup() {
   this->pin_->setup();
   this->store_.pin = this->pin_->to_isr();
   this->store_.last_level = this->pin_->digital_read();
-  this->last_update_ = micros();
   this->store_.last_interrupt = micros();
 
   this->pin_->attach_interrupt(DutyCycleSensorStore::gpio_intr, &this->store_, gpio::INTERRUPT_ANY_EDGE);
@@ -24,19 +23,20 @@ void DutyCycleSensor::dump_config() {
 }
 void DutyCycleSensor::update() {
   const uint32_t now = micros();
-  const bool level = this->store_.last_level;
-  const uint32_t last_interrupt = this->store_.last_interrupt;
-  uint32_t on_time = this->store_.on_time;
+  if (this->last_update_ != 0) {
+    const bool level = this->store_.last_level;
+    const uint32_t last_interrupt = this->store_.last_interrupt;
+    uint32_t on_time = this->store_.on_time;
 
-  if (level)
-    on_time += now - last_interrupt;
+    if (level)
+      on_time += now - last_interrupt;
 
-  const float total_time = float(now - this->last_update_);
-
-  const float value = (on_time / total_time) * 100.0f;
-  ESP_LOGD(TAG, "'%s' Got duty cycle=%.1f%%", this->get_name().c_str(), value);
-  this->publish_state(value);
+    const float total_time = float(now - this->last_update_);
 
+    const float value = (on_time / total_time) * 100.0f;
+    ESP_LOGD(TAG, "'%s' Got duty cycle=%.1f%%", this->get_name().c_str(), value);
+    this->publish_state(value);
+  }
   this->store_.on_time = 0;
   this->store_.last_interrupt = now;
   this->last_update_ = now;
diff --git a/esphome/components/duty_cycle/duty_cycle_sensor.h b/esphome/components/duty_cycle/duty_cycle_sensor.h
index 22d3588fb7..ffb1802e14 100644
--- a/esphome/components/duty_cycle/duty_cycle_sensor.h
+++ b/esphome/components/duty_cycle/duty_cycle_sensor.h
@@ -30,7 +30,7 @@ class DutyCycleSensor : public sensor::Sensor, public PollingComponent {
   InternalGPIOPin *pin_;
 
   DutyCycleSensorStore store_{};
-  uint32_t last_update_;
+  uint32_t last_update_{0};
 };
 
 }  // namespace duty_cycle
diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.cpp b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
index f538a4c905..d9f198f4fc 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.cpp
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
@@ -155,16 +155,20 @@ void PulseCounterSensor::dump_config() {
 
 void PulseCounterSensor::update() {
   pulse_counter_t raw = this->storage_.read_raw_value();
-  float value = (60000.0f * raw) / float(this->get_update_interval());  // per minute
-
-  ESP_LOGD(TAG, "'%s': Retrieved counter: %0.2f pulses/min", this->get_name().c_str(), value);
-  this->publish_state(value);
+  uint32_t now = millis();
+  if (this->last_time_ != 0) {
+    uint32_t interval = now - this->last_time_;
+    float value = (60000.0f * raw) / float(interval);  // per minute
+    ESP_LOGD(TAG, "'%s': Retrieved counter: %0.2f pulses/min", this->get_name().c_str(), value);
+    this->publish_state(value);
+  }
 
   if (this->total_sensor_ != nullptr) {
     current_total_ += raw;
     ESP_LOGD(TAG, "'%s': Total : %i pulses", this->get_name().c_str(), current_total_);
     this->total_sensor_->publish_state(current_total_);
   }
+  this->last_time_ = now;
 }
 
 }  // namespace pulse_counter
diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.h b/esphome/components/pulse_counter/pulse_counter_sensor.h
index 94e37bc232..9ed2159ae3 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.h
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.h
@@ -65,7 +65,8 @@ class PulseCounterSensor : public sensor::Sensor, public PollingComponent {
  protected:
   InternalGPIOPin *pin_;
   PulseCounterStorage storage_;
-  uint32_t current_total_ = 0;
+  uint32_t last_time_{0};
+  uint32_t current_total_{0};
   sensor::Sensor *total_sensor_;
 };