From 9785cb910d2b8c81785afb58d76090cb57c5b2df Mon Sep 17 00:00:00 2001
From: David Conran <crankyoldgit@users.noreply.github.com>
Date: Thu, 6 Jun 2024 16:45:28 +1000
Subject: [PATCH] [Bug] Fix the Coolix fan-only mode in IRac class. (#2104)

Mode was being incorrectly set in produced message as a "Dry" command.
Adjusting order of when setMode() was called fixes the issue.
Add a Unit test to confirm it is fixed and catch this in future.

Fixes #2103
---
 src/IRac.cpp       |  4 +++-
 test/IRac_test.cpp | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/IRac.cpp b/src/IRac.cpp
index 3e1a2d633..602e0018d 100644
--- a/src/IRac.cpp
+++ b/src/IRac.cpp
@@ -736,8 +736,10 @@ void IRac::coolix(IRCoolixAC *ac,
       ac->send();
       return;
   }
-  ac->setMode(ac->convertMode(mode));
   ac->setTemp(degrees);
+  // Mode needs to be set after temp as Fan-only uses a special temp.
+  ac->setMode(ac->convertMode(mode));
+  // Fan needs to be set after mode, as setMode can change the fan speed.
   ac->setFan(ac->convertFan(fan));
   // No Filter setting available.
   // No Beep setting available.
diff --git a/test/IRac_test.cpp b/test/IRac_test.cpp
index 5d9084ecb..c4d30f386 100644
--- a/test/IRac_test.cpp
+++ b/test/IRac_test.cpp
@@ -247,6 +247,36 @@ TEST(TestIRac, Coolix) {
   ASSERT_EQ(stdAc::ac_command_t::kControlCommand, r.command);
 }
 
+TEST(TestIRac, Coolix_Issue2103) {
+  IRCoolixAC ac(kGpioUnused);
+  IRac irac(kGpioUnused);
+  IRrecv capture(kGpioUnused);
+  char expected[] =
+      "Power: On, Mode: 4 (Fan), Fan: 5 (Auto), Zone Follow: Off, "
+      "Sensor Temp: Off";
+
+  ac.begin();
+  irac.coolix(&ac,
+              true,                        // Power
+              stdAc::opmode_t::kFan,       // Mode
+              21,                          // Celsius
+              kNoTempValue,                // Sensor Temp
+              stdAc::fanspeed_t::kAuto,    // Fan speed
+              stdAc::swingv_t::kOff,       // Vertical swing
+              stdAc::swingh_t::kOff,       // Horizontal swing
+              false,                       // iFeel
+              false,                       // Turbo
+              false,                       // Light
+              false,                       // Clean
+              -1);                         // Sleep
+  ASSERT_EQ(expected, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(COOLIX, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kCoolixBits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
+
 TEST(TestIRac, Corona) {
   IRCoronaAc ac(kGpioUnused);
   IRac irac(kGpioUnused);