From b8fa737bc956577e7b2635af7f60b43633613a58 Mon Sep 17 00:00:00 2001
From: rufuswilson <marsou75@gmail.com>
Date: Wed, 13 Sep 2023 00:20:00 +0200
Subject: [PATCH] Force heater off on setup (#5161)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/sht3xd/sensor.py  | 7 ++++++-
 esphome/components/sht3xd/sht3xd.cpp | 4 ++++
 esphome/components/sht3xd/sht3xd.h   | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/sht3xd/sensor.py b/esphome/components/sht3xd/sensor.py
index 8e1ef426ad..5c73a63f1a 100644
--- a/esphome/components/sht3xd/sensor.py
+++ b/esphome/components/sht3xd/sensor.py
@@ -12,6 +12,8 @@ from esphome.const import (
     UNIT_PERCENT,
 )
 
+CONF_HEATER_ENABLED = "heater_enabled"
+
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
 
@@ -36,7 +38,8 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_HUMIDITY,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
-        }
+            cv.Optional(CONF_HEATER_ENABLED, default=True): cv.boolean,
+        },
     )
     .extend(cv.polling_component_schema("60s"))
     .extend(i2c.i2c_device_schema(0x44))
@@ -48,6 +51,8 @@ async def to_code(config):
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
+    cg.add(var.set_heater_enabled(config[CONF_HEATER_ENABLED]))
+
     if CONF_TEMPERATURE in config:
         sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
         cg.add(var.set_temperature_sensor(sens))
diff --git a/esphome/components/sht3xd/sht3xd.cpp b/esphome/components/sht3xd/sht3xd.cpp
index 4e1c9742bc..f4bd2da271 100644
--- a/esphome/components/sht3xd/sht3xd.cpp
+++ b/esphome/components/sht3xd/sht3xd.cpp
@@ -22,6 +22,10 @@ void SHT3XDComponent::setup() {
     this->mark_failed();
     return;
   }
+  if (!this->write_command(heater_enabled_ ? SHT3XD_COMMAND_HEATER_ENABLE : SHT3XD_COMMAND_HEATER_DISABLE)) {
+    this->mark_failed();
+    return;
+  }
   uint32_t serial_number = (uint32_t(raw_serial_number[0]) << 16) | uint32_t(raw_serial_number[1]);
   ESP_LOGV(TAG, "    Serial Number: 0x%08X", serial_number);
 }
diff --git a/esphome/components/sht3xd/sht3xd.h b/esphome/components/sht3xd/sht3xd.h
index 41ca3c5d6e..04023c8a46 100644
--- a/esphome/components/sht3xd/sht3xd.h
+++ b/esphome/components/sht3xd/sht3xd.h
@@ -17,10 +17,12 @@ class SHT3XDComponent : public PollingComponent, public sensirion_common::Sensir
   void dump_config() override;
   float get_setup_priority() const override;
   void update() override;
+  void set_heater_enabled(bool heater_enabled) { heater_enabled_ = heater_enabled; }
 
  protected:
   sensor::Sensor *temperature_sensor_{nullptr};
   sensor::Sensor *humidity_sensor_{nullptr};
+  bool heater_enabled_{true};
 };
 
 }  // namespace sht3xd