Add HITACHI_AC1 to Common A/C api.

* Add IRac::hitachi1 * Adjust `sendAc()` * Adjust `resultAcToString()` * Add/update unit tests. Fixes #1056 Fixes #1061
crankyoldgit · Apr 2, 2020 · b44de67 · b44de67
1 parent db4454b
commit b44de67
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 1 deletion.
diff --git a/src/IRac.cpp b/src/IRac.cpp
@@ -144,6 +144,9 @@ bool IRac::isProtocolSupported(const decode_type_t protocol) {
 #if SEND_HITACHI_AC
     case decode_type_t::HITACHI_AC:
 #endif
+#if SEND_HITACHI_AC1
+    case decode_type_t::HITACHI_AC1:
+#endif
 #if SEND_HITACHI_AC424
     case decode_type_t::HITACHI_AC424:
 #endif
@@ -674,6 +677,30 @@ void IRac::hitachi(IRHitachiAc *ac,
 }
 #endif  // SEND_HITACHI_AC
 
+#if SEND_HITACHI_AC1
+void IRac::hitachi1(IRHitachiAc1 *ac,
+                    const bool on, const stdAc::opmode_t mode,
+                    const float degrees, const stdAc::fanspeed_t fan,
+                    const stdAc::swingv_t swingv) {
+  ac->begin();
+  ac->setPower(on);
+  ac->setMode(ac->convertMode(mode));
+  ac->setTemp(degrees);
+  ac->setFan(ac->convertFan(fan));
+  ac->setSwing(swingv != stdAc::swingv_t::kOff);
+  // No Swing(H) setting available.
+  // No Quiet setting available.
+  // No Turbo setting available.
+  // No Light setting available.
+  // No Filter setting available.
+  // No Clean setting available.
+  // No Beep setting available.
+  // No Sleep setting available.
+  // No Clock setting available.
+  ac->send();
+}
+#endif  // SEND_HITACHI_AC1
+
 #if SEND_HITACHI_AC424
 void IRac::hitachi424(IRHitachiAc424 *ac,
                       const bool on, const stdAc::opmode_t mode,
@@ -1457,6 +1484,14 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
       break;
     }
 #endif  // SEND_HITACHI_AC
+#if SEND_HITACHI_AC1
+    case HITACHI_AC1:
+    {
+      IRHitachiAc1 ac(_pin, _inverted, _modulation);
+      hitachi1(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv);
+      break;
+    }
+#endif  // SEND_HITACHI_AC1
 #if SEND_HITACHI_AC424
     case HITACHI_AC424:
     {
@@ -2368,6 +2403,14 @@ namespace IRAcUtils {
         break;
       }
 #endif  // (DECODE_HITACHI_AC || DECODE_HITACHI_AC2)
+#if DECODE_HITACHI_AC1
+      case decode_type_t::HITACHI_AC1: {
+        IRHitachiAc1 ac(kGpioUnused);
+        ac.setRaw(decode->state);
+        *result = ac.toCommon();
+        break;
+      }
+#endif  // DECODE_HITACHI_AC1
 #if DECODE_HITACHI_AC424
       case decode_type_t::HITACHI_AC424: {
         IRHitachiAc424 ac(kGpioUnused);

diff --git a/src/IRac.h b/src/IRac.h
@@ -219,6 +219,12 @@ void electra(IRElectraAc *ac,
                const float degrees, const stdAc::fanspeed_t fan,
                const stdAc::swingv_t swingv, const stdAc::swingh_t swingh);
 #endif  // SEND_HITACHI_AC
+#if SEND_HITACHI_AC1
+  void hitachi1(IRHitachiAc1 *ac,
+               const bool on, const stdAc::opmode_t mode,
+               const float degrees, const stdAc::fanspeed_t fan,
+               const stdAc::swingv_t swingv);
+#endif  // SEND_HITACHI_AC1
 #if SEND_HITACHI_AC424
   void hitachi424(IRHitachiAc424 *ac,
                   const bool on, const stdAc::opmode_t mode,

diff --git a/test/IRac_test.cpp b/test/IRac_test.cpp
@@ -571,6 +571,31 @@ TEST(TestIRac, Hitachi) {
   ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
 
+TEST(TestIRac, Hitachi1) {
+  IRHitachiAc1 ac(kGpioUnused);
+  IRac irac(kGpioUnused);
+  IRrecv capture(kGpioUnused);
+  char expected[] =
+      "Power: On, Mode: 15 (Auto), Temp: 19C, Fan: 4 (Medium), Swing: Off";
+
+  ac.begin();
+  irac.hitachi1(&ac,
+                true,                        // Power
+                stdAc::opmode_t::kAuto,      // Mode
+                19,                          // Celsius
+                stdAc::fanspeed_t::kMedium,  // Fan speed
+                stdAc::swingv_t::kOff);      // Veritcal swing
+
+  ASSERT_EQ(expected, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(HITACHI_AC1, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kHitachiAc1Bits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
+  stdAc::state_t r, p;
+  ASSERT_TRUE(IRAcUtils::decodeToState(&ac._irsend.capture, &r, &p));
+}
+
 TEST(TestIRac, Hitachi424) {
   IRHitachiAc424 ac(0);
   IRac irac(0);

diff --git a/test/ir_Hitachi_test.cpp b/test/ir_Hitachi_test.cpp
@@ -809,7 +809,7 @@ TEST(TestUtils, Housekeeping) {
   ASSERT_EQ("HITACHI_AC1", typeToString(decode_type_t::HITACHI_AC1));
   ASSERT_EQ(decode_type_t::HITACHI_AC1, strToDecodeType("HITACHI_AC1"));
   ASSERT_TRUE(hasACState(decode_type_t::HITACHI_AC1));
-  ASSERT_FALSE(IRac::isProtocolSupported(decode_type_t::HITACHI_AC1));
+  ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::HITACHI_AC1));
 
   ASSERT_EQ("HITACHI_AC2", typeToString(decode_type_t::HITACHI_AC2));
   ASSERT_EQ(decode_type_t::HITACHI_AC2, strToDecodeType("HITACHI_AC2"));