From 40934484c6d589c5ae29a980f00aaf9a95ae59cb Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 17 Sep 2026 08:34:36 -0500
Subject: [PATCH] [output] Use BinaryOutput::set_state() instead of hand
 written turn_on/turn_off branches (#19366)

---
 esphome/components/binary/light/binary_light_output.h  | 6 +-----
 esphome/components/improv_ble/improv_ble_component.cpp | 6 +-----
 esphome/components/mcp4461/output/mcp4461_output.cpp   | 8 --------
 esphome/components/mcp4461/output/mcp4461_output.h     | 3 ---
 esphome/components/output/switch/output_switch.cpp     | 6 +-----
 5 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/esphome/components/binary/light/binary_light_output.h b/esphome/components/binary/light/binary_light_output.h
index 32707e8b0c8..b8de7932cd6 100644
--- a/esphome/components/binary/light/binary_light_output.h
+++ b/esphome/components/binary/light/binary_light_output.h
@@ -17,11 +17,7 @@ class BinaryLightOutput final : public light::LightOutput {
   void write_state(light::LightState *state) override {
     bool binary;
     state->current_values_as_binary(&binary);
-    if (binary) {
-      this->output_->turn_on();
-    } else {
-      this->output_->turn_off();
-    }
+    this->output_->set_state(binary);
   }
 
  protected:
diff --git a/esphome/components/improv_ble/improv_ble_component.cpp b/esphome/components/improv_ble/improv_ble_component.cpp
index bbc1589abf0..0a20beb33c8 100644
--- a/esphome/components/improv_ble/improv_ble_component.cpp
+++ b/esphome/components/improv_ble/improv_ble_component.cpp
@@ -208,11 +208,7 @@ void ImprovBLEComponent::set_status_indicator_state_(bool state) {
   if (this->status_indicator_state_ == state)
     return;
   this->status_indicator_state_ = state;
-  if (state) {
-    this->status_indicator_->turn_on();
-  } else {
-    this->status_indicator_->turn_off();
-  }
+  this->status_indicator_->set_state(state);
 #endif
 }
 
diff --git a/esphome/components/mcp4461/output/mcp4461_output.cpp b/esphome/components/mcp4461/output/mcp4461_output.cpp
index 5c373ddc7d2..d38eed4d096 100644
--- a/esphome/components/mcp4461/output/mcp4461_output.cpp
+++ b/esphome/components/mcp4461/output/mcp4461_output.cpp
@@ -38,14 +38,6 @@ float Mcp4461Wiper::update_state() {
   return this->state_;
 }
 
-void Mcp4461Wiper::set_state(bool state) {
-  if (state) {
-    this->turn_on();
-  } else {
-    this->turn_off();
-  }
-}
-
 void Mcp4461Wiper::turn_on() { this->parent_->enable_wiper_(this->wiper_); }
 
 void Mcp4461Wiper::turn_off() { this->parent_->disable_wiper_(this->wiper_); }
diff --git a/esphome/components/mcp4461/output/mcp4461_output.h b/esphome/components/mcp4461/output/mcp4461_output.h
index c8d1ef1ec51..1052369a744 100644
--- a/esphome/components/mcp4461/output/mcp4461_output.h
+++ b/esphome/components/mcp4461/output/mcp4461_output.h
@@ -13,9 +13,6 @@ class Mcp4461Wiper final : public output::FloatOutput, public Parented<Mcp4461Co
   /// @brief Set level of wiper
   /// @param[in] state - The desired float level in range 0-1.0
   void set_level(float state);
-  /// @brief Enables/Disables current output using bool parameter
-  /// @param[in] state boolean var representing desired state (true=ON, false=OFF)
-  void set_state(bool state) override;
   /// @brief Enables current output
   void turn_on() override;
   /// @brief Disables current output
diff --git a/esphome/components/output/switch/output_switch.cpp b/esphome/components/output/switch/output_switch.cpp
index 325514ddf40..a21cbc0f6b9 100644
--- a/esphome/components/output/switch/output_switch.cpp
+++ b/esphome/components/output/switch/output_switch.cpp
@@ -8,11 +8,7 @@ static const char *const TAG = "output.switch";
 void OutputSwitch::dump_config() { LOG_SWITCH("", "Output Switch", this); }
 void OutputSwitch::setup() { this->control(this->get_initial_state_with_restore_mode().value_or(false)); }
 void OutputSwitch::write_state(bool state) {
-  if (state) {
-    this->output_->turn_on();
-  } else {
-    this->output_->turn_off();
-  }
+  this->output_->set_state(state);
   this->publish_state(state);
 }