From f7311aa02576cb3d64c2b37173f81e58d2522c97 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 2 Aug 2021 20:33:00 +1200
Subject: [PATCH] Dont force 0 state instead of min_power unless explicit
 config set (#2107)

---
 esphome/components/output/__init__.py      | 5 +++++
 esphome/components/output/float_output.cpp | 4 +++-
 esphome/components/output/float_output.h   | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/esphome/components/output/__init__.py b/esphome/components/output/__init__.py
index 4471794033..4f1fb33fe7 100644
--- a/esphome/components/output/__init__.py
+++ b/esphome/components/output/__init__.py
@@ -17,6 +17,8 @@ from esphome.core import CORE
 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
 
+CONF_ZERO_MEANS_ZERO = "zero_means_zero"
+
 BINARY_OUTPUT_SCHEMA = cv.Schema(
     {
         cv.Optional(CONF_POWER_SUPPLY): cv.use_id(power_supply.PowerSupply),
@@ -28,6 +30,7 @@ FLOAT_OUTPUT_SCHEMA = BINARY_OUTPUT_SCHEMA.extend(
     {
         cv.Optional(CONF_MAX_POWER): cv.percentage,
         cv.Optional(CONF_MIN_POWER): cv.percentage,
+        cv.Optional(CONF_ZERO_MEANS_ZERO, default=False): cv.boolean,
     }
 )
 
@@ -53,6 +56,8 @@ async def setup_output_platform_(obj, config):
         cg.add(obj.set_max_power(config[CONF_MAX_POWER]))
     if CONF_MIN_POWER in config:
         cg.add(obj.set_min_power(config[CONF_MIN_POWER]))
+    if CONF_ZERO_MEANS_ZERO in config:
+        cg.add(obj.set_zero_means_zero(config[CONF_ZERO_MEANS_ZERO]))
 
 
 async def register_output(var, config):
diff --git a/esphome/components/output/float_output.cpp b/esphome/components/output/float_output.cpp
index 99ba798cb9..5820a2d7cd 100644
--- a/esphome/components/output/float_output.cpp
+++ b/esphome/components/output/float_output.cpp
@@ -17,6 +17,8 @@ void FloatOutput::set_min_power(float min_power) {
   this->min_power_ = clamp(min_power, 0.0f, this->max_power_);  // Clamp to 0.0>=MIN>=MAX
 }
 
+void FloatOutput::set_zero_means_zero(bool zero_means_zero) { this->zero_means_zero_ = zero_means_zero; }
+
 float FloatOutput::get_min_power() const { return this->min_power_; }
 
 void FloatOutput::set_level(float state) {
@@ -31,7 +33,7 @@ void FloatOutput::set_level(float state) {
 #endif
   if (this->is_inverted())
     state = 1.0f - state;
-  if (state == 0.0f) {  // regardless of min_power_, 0.0 means off
+  if (state == 0.0f && this->zero_means_zero_) {  // regardless of min_power_, 0.0 means off
     this->write_state(state);
     return;
   }
diff --git a/esphome/components/output/float_output.h b/esphome/components/output/float_output.h
index 1b969c9225..3e2b3ada8d 100644
--- a/esphome/components/output/float_output.h
+++ b/esphome/components/output/float_output.h
@@ -46,6 +46,12 @@ class FloatOutput : public BinaryOutput {
    */
   void set_min_power(float min_power);
 
+  /** Sets this output to ignore min_power for a 0 state
+   *
+   * @param zero True if a 0 state should mean 0 and not min_power.
+   */
+  void set_zero_means_zero(bool zero_means_zero);
+
   /** Set the level of this float output, this is called from the front-end.
    *
    * @param state The new state.
@@ -76,6 +82,7 @@ class FloatOutput : public BinaryOutput {
 
   float max_power_{1.0f};
   float min_power_{0.0f};
+  bool zero_means_zero_;
 };
 
 }  // namespace output