From e6b1187689b81d38fc4f755a88922cdd820319e1 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Mon, 8 Apr 2024 17:56:08 +1000
Subject: [PATCH] If the loop() took more than the required time, don't delay
 further (#6496)

---
 esphome/core/application.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index d82a7a5d37..a4550bcd9e 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -81,13 +81,11 @@ void Application::loop() {
 
   const uint32_t now = millis();
 
-  if (HighFrequencyLoopRequester::is_high_frequency()) {
+  auto elapsed = now - this->last_loop_;
+  if (elapsed >= this->loop_interval_ || HighFrequencyLoopRequester::is_high_frequency()) {
     yield();
   } else {
-    uint32_t delay_time = this->loop_interval_;
-    if (now - this->last_loop_ < this->loop_interval_)
-      delay_time = this->loop_interval_ - (now - this->last_loop_);
-
+    uint32_t delay_time = this->loop_interval_ - elapsed;
     uint32_t next_schedule = this->scheduler.next_schedule_in().value_or(delay_time);
     // next_schedule is max 0.5*delay_time
     // otherwise interval=0 schedules result in constant looping with almost no sleep