From a943bc6c80a4bb70a2801c1cf3d5f9f69b581e45 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 17:27:22 +0200
Subject: [PATCH] Fix merge

---
 esphome/core/application.cpp | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index 96a01d3b51..a2f94235f5 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -105,42 +105,6 @@ void Application::loop() {
     this->dump_config_at_++;
   }
 }
-void Application::loop() {
-  uint32_t new_app_state = 0;
-  const uint32_t start = millis();
-  for (Component *component : this->components_) {
-    if (!component->is_failed()) {
-      component->call_loop();
-    }
-    new_app_state |= component->get_component_state();
-    this->app_state_ |= new_app_state;
-    this->feed_wdt();
-  }
-  this->app_state_ = new_app_state;
-  const uint32_t end = millis();
-  if (end - start > 200) {
-    ESP_LOGV(TAG, "A component took a long time in a loop() cycle (%.1f s).", (end - start) / 1e3f);
-    ESP_LOGV(TAG, "Components should block for at most 20-30ms in loop().");
-    ESP_LOGV(TAG, "This will become a warning soon.");
-  }
-
-  const uint32_t now = millis();
-
-  if (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_);
-    delay(delay_time);
-  }
-  this->last_loop_ = now;
-
-  if (this->dump_config_scheduled_) {
-    this->dump_config();
-    this->dump_config_scheduled_ = false;
-  }
-}
 
 void ICACHE_RAM_ATTR HOT Application::feed_wdt() {
   static uint32_t LAST_FEED = 0;