DelonghiAc: Add On Timer support.

For #1096
crankyoldgit · May 2, 2020 · 1b3d6b7 · 1b3d6b7
1 parent c37795a
commit 1b3d6b7
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 4 deletions.
diff --git a/src/ir_Delonghi.cpp b/src/ir_Delonghi.cpp
@@ -11,7 +11,9 @@
 using irutils::addBoolToString;
 using irutils::addModeToString;
 using irutils::addFanToString;
+using irutils::addLabeledString;
 using irutils::addTempToString;
+using irutils::minsToString;
 using irutils::setBit;
 using irutils::setBits;
 
@@ -310,6 +312,35 @@ bool IRDelonghiAc::getSleep(void) {
   return GETBIT64(remote_state, kDelonghiAcSleepBit);
 }
 
+void IRDelonghiAc::setTimerEnabled(const bool on) {
+  setBit(&remote_state, kDelonghiAcTimerEnableBit, on);
+}
+
+bool IRDelonghiAc::getTimerEnabled(void) {
+  return GETBIT64(remote_state, kDelonghiAcTimerEnableBit);
+}
+
+// Set the On timer to activate in nr of minutes.
+// Args:
+//   nr_of_mins: Total nr of mins to wait before waking the device.
+//               (Max 23 hrs and 59 minutes. i.e. 1439 mins)
+void IRDelonghiAc::setOnTimer(const uint16_t nr_of_mins) {
+  uint16_t value = std::min(kDelonghiAcTimerMax, nr_of_mins);
+  setBits(&remote_state, kDelonghiAcOnTimerMinsOffset, kDelonghiAcMinsSize,
+          value % 60);  // Minutes.
+  setBits(&remote_state, kDelonghiAcOnTimerHoursOffset, kDelonghiAcHoursSize,
+          value / 60);  // Hours.
+  // Enable or not?
+  setTimerEnabled(getTimerEnabled() || value);
+}
+
+uint16_t IRDelonghiAc::getOnTimer(void) {
+  return GETBITS64(remote_state, kDelonghiAcOnTimerHoursOffset,
+                   kDelonghiAcHoursSize) * 60 +
+      GETBITS64(remote_state, kDelonghiAcOnTimerMinsOffset,
+                      kDelonghiAcMinsSize);
+}
+
 // Convert the A/C state to it's common equivalent.
 stdAc::state_t IRDelonghiAc::toCommon(void) {
   stdAc::state_t result;
@@ -348,5 +379,8 @@ String IRDelonghiAc::toString(void) {
   result += addTempToString(getTemp(), !getTempUnit());
   result += addBoolToString(getBoost(), kTurboStr);
   result += addBoolToString(getSleep(), kSleepStr);
+  result += addBoolToString(getTimerEnabled(), kTimerStr);
+  uint16_t mins = getOnTimer();
+  result += addLabeledString(mins ? minsToString(mins) : kOffStr, kOnTimerStr);
   return result;
 }
diff --git a/src/ir_Delonghi.h b/src/ir_Delonghi.h
@@ -75,8 +75,18 @@ const uint8_t kDelonghiAcDry =    0b001;
 const uint8_t kDelonghiAcFan =    0b010;
 const uint8_t kDelonghiAcAuto =   0b100;
 const uint8_t kDelonghiAcBoostBit = kDelonghiAcModeOffset +
-    kDelonghiAcModeSize;  // 17 (Aka Turbo)
-const uint8_t kDelonghiAcSleepBit = kDelonghiAcBoostBit + 1;  // 18
+    kDelonghiAcModeSize;  // 20 (Aka Turbo)
+const uint8_t kDelonghiAcSleepBit = kDelonghiAcBoostBit + 1;  // 21
+// Two zero bits
+const uint8_t kDelonghiAcTimerEnableBit = kDelonghiAcSleepBit + 3;  // 24
+const uint8_t kDelonghiAcHoursSize = 5;  // Max 23 hrs
+const uint8_t kDelonghiAcMinsSize = 6;  // Max 59 mins
+const uint16_t kDelonghiAcTimerMax = 23 * 60 + 59;
+const uint8_t kDelonghiAcOnTimerHoursOffset = kDelonghiAcTimerEnableBit +
+    1;  // 25
+const uint8_t kDelonghiAcOnTimerMinsOffset = kDelonghiAcOnTimerHoursOffset +
+    kDelonghiAcHoursSize + 2;  // 32  (inc another two zero bits)
+// Next available bit is kDelonghiAcOnTimerMinsOffset + kDelonghiAcMinsSize = 38
 const uint8_t kDelonghiAcChecksumOffset = 56;
 const uint8_t kDelonghiAcChecksumSize = 8;
 
@@ -112,6 +122,10 @@ class IRDelonghiAc {
   bool getBoost();  // Aka Turbo
   void setSleep(const bool on);
   bool getSleep();
+  void setTimerEnabled(const bool on);
+  bool getTimerEnabled(void);
+  void setOnTimer(const uint16_t nr_of_mins);
+  uint16_t getOnTimer(void);
   uint64_t getRaw();
   void setRaw(const uint64_t state);
   uint8_t convertMode(const stdAc::opmode_t mode);

diff --git a/test/IRac_test.cpp b/test/IRac_test.cpp
@@ -384,7 +384,7 @@ TEST(TestIRac, DelonghiAc) {
   IRrecv capture(kGpioUnused);
   char expected[] =
       "Power: On, Mode: 0 (Cool), Fan: 2 (Medium), Temp: 77F, "
-      "Turbo: On, Sleep: On";
+      "Turbo: On, Sleep: On, Timer: Off, On Timer: Off";
 
   ac.begin();
   irac.delonghiac(&ac,

diff --git a/test/ir_Delonghi_test.cpp b/test/ir_Delonghi_test.cpp
@@ -67,7 +67,7 @@ TEST(TestDecodeDelonghiAc, RealExample) {
   EXPECT_EQ(0, irsend.capture.address);
   EXPECT_EQ(
       "Power: On, Mode: 0 (Cool), Fan: 3 (Low), Temp: 90F, "
-      "Turbo: Off, Sleep: Off",
+      "Turbo: Off, Sleep: Off, Timer: On, On Timer: 06:13",
       IRAcUtils::resultAcToString(&irsend.capture));
   stdAc::state_t r, p;
   ASSERT_TRUE(IRAcUtils::decodeToState(&irsend.capture, &r, &p));
@@ -264,3 +264,37 @@ TEST(TestIRDelonghiAcClass, Sleep) {
   ac.setSleep(false);
   EXPECT_FALSE(ac.getSleep());
 }
+
+TEST(TestIRDelonghiAcClass, OnTimer) {
+  IRDelonghiAc ac(kGpioUnused);
+  ac.begin();
+
+  ac.setTimerEnabled(false);
+  EXPECT_FALSE(ac.getTimerEnabled());
+  ac.setTimerEnabled(true);
+  EXPECT_TRUE(ac.getTimerEnabled());
+  ac.setTimerEnabled(false);
+  EXPECT_FALSE(ac.getTimerEnabled());
+
+  ac.setOnTimer(0);
+  EXPECT_FALSE(ac.getTimerEnabled());
+  EXPECT_EQ(0, ac.getOnTimer());
+
+  ac.setOnTimer(1);
+  EXPECT_TRUE(ac.getTimerEnabled());
+  EXPECT_EQ(1, ac.getOnTimer());
+
+  ac.setOnTimer(61);
+  EXPECT_TRUE(ac.getTimerEnabled());
+  EXPECT_EQ(61, ac.getOnTimer());
+
+  ac.setTimerEnabled(false);
+  ac.setOnTimer(23 * 60 + 59);
+  EXPECT_TRUE(ac.getTimerEnabled());
+  EXPECT_EQ(23 * 60 + 59, ac.getOnTimer());
+
+  ac.setTimerEnabled(false);
+  ac.setOnTimer(24 * 60);
+  EXPECT_TRUE(ac.getTimerEnabled());
+  EXPECT_EQ(23 * 60 + 59, ac.getOnTimer());
+}