Uncouple safe_mode from OTA (#6759)

esphome/components/safe_mode/button/__init__.py

@@ -1,16 +1,15 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import button
-from esphome.components.esphome.ota import ESPHomeOTAComponent
 from esphome.const import (
-    CONF_ESPHOME,
+    CONF_SAFE_MODE,
     DEVICE_CLASS_RESTART,
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
-from .. import safe_mode_ns
+from .. import safe_mode_ns, SafeModeComponent
 
-DEPENDENCIES = ["ota.esphome"]
+DEPENDENCIES = ["safe_mode"]
 
 SafeModeButton = safe_mode_ns.class_("SafeModeButton", button.Button, cg.Component)
 
@@ -21,7 +20,7 @@ CONFIG_SCHEMA = (
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_RESTART_ALERT,
     )
-    .extend({cv.GenerateID(CONF_ESPHOME): cv.use_id(ESPHomeOTAComponent)})
+    .extend({cv.GenerateID(CONF_SAFE_MODE): cv.use_id(SafeModeComponent)})
     .extend(cv.COMPONENT_SCHEMA)
 )
 
@@ -30,5 +29,5 @@ async def to_code(config):
     var = await button.new_button(config)
     await cg.register_component(var, config)
 
-    ota = await cg.get_variable(config[CONF_ESPHOME])
-    cg.add(var.set_ota(ota))
+    safe_mode_component = await cg.get_variable(config[CONF_SAFE_MODE])
+    cg.add(var.set_safe_mode(safe_mode_component))

esphome/components/safe_mode/button/safe_mode_button.cpp

@@ -8,11 +8,13 @@ namespace safe_mode {
 
 static const char *const TAG = "safe_mode.button";
 
-void SafeModeButton::set_ota(esphome::ESPHomeOTAComponent *ota) { this->ota_ = ota; }
+void SafeModeButton::set_safe_mode(SafeModeComponent *safe_mode_component) {
+  this->safe_mode_component_ = safe_mode_component;
+}
 
 void SafeModeButton::press_action() {
   ESP_LOGI(TAG, "Restarting device in safe mode...");
-  this->ota_->set_safe_mode_pending(true);
+  this->safe_mode_component_->set_safe_mode_pending(true);
 
   // Let MQTT settle a bit
   delay(100);  // NOLINT

esphome/components/safe_mode/button/safe_mode_button.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "esphome/components/button/button.h"
-#include "esphome/components/esphome/ota/ota_esphome.h"
+#include "esphome/components/safe_mode/safe_mode.h"
 #include "esphome/core/component.h"
 
 namespace esphome {
@@ -10,10 +10,10 @@ namespace safe_mode {
 class SafeModeButton : public button::Button, public Component {
  public:
   void dump_config() override;
-  void set_ota(esphome::ESPHomeOTAComponent *ota);
+  void set_safe_mode(SafeModeComponent *safe_mode_component);
 
  protected:
-  esphome::ESPHomeOTAComponent *ota_;
+  SafeModeComponent *safe_mode_component_;
   void press_action() override;
 };