From 1be106c0b5f9dfa3b6df668a36975d3f7a7421ab Mon Sep 17 00:00:00 2001
From: wifwucite <74489218+wifwucite@users.noreply.github.com>
Date: Wed, 8 Sep 2021 05:30:17 +0200
Subject: [PATCH] Fix fan speed restore issue on boot (#1867)

---
 esphome/components/binary/fan/binary_fan.cpp | 5 ++++-
 esphome/components/fan/fan_state.cpp         | 2 +-
 esphome/components/speed/fan/speed_fan.cpp   | 5 ++++-
 esphome/components/tuya/fan/tuya_fan.cpp     | 4 ++++
 esphome/components/tuya/fan/tuya_fan.h       | 1 +
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/esphome/components/binary/fan/binary_fan.cpp b/esphome/components/binary/fan/binary_fan.cpp
index eaf41829bb..2201fe576e 100644
--- a/esphome/components/binary/fan/binary_fan.cpp
+++ b/esphome/components/binary/fan/binary_fan.cpp
@@ -55,7 +55,10 @@ void BinaryFan::loop() {
     ESP_LOGD(TAG, "Setting reverse direction: %s", ONOFF(enable));
   }
 }
-float BinaryFan::get_setup_priority() const { return setup_priority::DATA; }
+
+// We need a higher priority than the FanState component to make sure that the traits are set
+// when that component sets itself up.
+float BinaryFan::get_setup_priority() const { return fan_->get_setup_priority() + 1.0f; }
 
 }  // namespace binary
 }  // namespace esphome
diff --git a/esphome/components/fan/fan_state.cpp b/esphome/components/fan/fan_state.cpp
index 9b4ae53937..a4883c5e2c 100644
--- a/esphome/components/fan/fan_state.cpp
+++ b/esphome/components/fan/fan_state.cpp
@@ -39,7 +39,7 @@ void FanState::setup() {
   call.set_direction(recovered.direction);
   call.perform();
 }
-float FanState::get_setup_priority() const { return setup_priority::HARDWARE - 1.0f; }
+float FanState::get_setup_priority() const { return setup_priority::DATA - 1.0f; }
 uint32_t FanState::hash_base() { return 418001110UL; }
 
 void FanStateCall::perform() const {
diff --git a/esphome/components/speed/fan/speed_fan.cpp b/esphome/components/speed/fan/speed_fan.cpp
index 8c6ec54d4c..cb10db4ed4 100644
--- a/esphome/components/speed/fan/speed_fan.cpp
+++ b/esphome/components/speed/fan/speed_fan.cpp
@@ -56,7 +56,10 @@ void SpeedFan::loop() {
     ESP_LOGD(TAG, "Setting reverse direction: %s", ONOFF(enable));
   }
 }
-float SpeedFan::get_setup_priority() const { return setup_priority::DATA; }
+
+// We need a higher priority than the FanState component to make sure that the traits are set
+// when that component sets itself up.
+float SpeedFan::get_setup_priority() const { return fan_->get_setup_priority() + 1.0f; }
 
 }  // namespace speed
 }  // namespace esphome
diff --git a/esphome/components/tuya/fan/tuya_fan.cpp b/esphome/components/tuya/fan/tuya_fan.cpp
index e9f8ce8e96..f060b18eba 100644
--- a/esphome/components/tuya/fan/tuya_fan.cpp
+++ b/esphome/components/tuya/fan/tuya_fan.cpp
@@ -84,5 +84,9 @@ void TuyaFan::write_state() {
   }
 }
 
+// We need a higher priority than the FanState component to make sure that the traits are set
+// when that component sets itself up.
+float TuyaFan::get_setup_priority() const { return fan_->get_setup_priority() + 1.0f; }
+
 }  // namespace tuya
 }  // namespace esphome
diff --git a/esphome/components/tuya/fan/tuya_fan.h b/esphome/components/tuya/fan/tuya_fan.h
index a24e7a218e..e96770d8c3 100644
--- a/esphome/components/tuya/fan/tuya_fan.h
+++ b/esphome/components/tuya/fan/tuya_fan.h
@@ -11,6 +11,7 @@ class TuyaFan : public Component {
  public:
   TuyaFan(Tuya *parent, fan::FanState *fan, int speed_count) : parent_(parent), fan_(fan), speed_count_(speed_count) {}
   void setup() override;
+  float get_setup_priority() const override;
   void dump_config() override;
   void set_speed_id(uint8_t speed_id) { this->speed_id_ = speed_id; }
   void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }