Compatibility fixes for some models of air conditioners (#9)

* Don't let to overread the status response * Handle reported fan settings on msabbu-12hrdn1 * Apply suggestions from code review Co-authored-by: Sergey Dudanov <sergey.dudanov@gmail.com> --------- Co-authored-by: Sergey Dudanov <sergey.dudanov@gmail.com>
dudanov · Aug 7, 2023 · 5f58f2e · 5f58f2e
1 parent 3bbd505
commit 5f58f2e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/include/Appliance/AirConditioner/StatusData.h b/include/Appliance/AirConditioner/StatusData.h
@@ -84,7 +84,7 @@ class StatusData : public FrameData {
   void setMode(Mode mode);
 
   /* FAN SPEED */
-  FanMode getFanMode() const { return static_cast<FanMode>(this->m_getValue(3)); }
+  FanMode getFanMode() const;
   void setFanMode(FanMode mode) { this->m_setValue(3, mode); };
 
   /* SWING MODE */

diff --git a/include/Frame/FrameData.h b/include/Frame/FrameData.h
@@ -32,9 +32,7 @@ class FrameData {
   static uint8_t m_getID() { return FrameData::m_id++; }
   static uint8_t m_getRandom() { return random(256); }
   uint8_t m_calcCRC() const;
-  uint8_t m_getValue(uint8_t idx, uint8_t mask = 255, uint8_t shift = 0) const {
-    return (this->m_data[idx] >> shift) & mask;
-  }
+  uint8_t m_getValue(uint8_t idx, uint8_t mask = 255, uint8_t shift = 0) const;
   void m_setValue(uint8_t idx, uint8_t value, uint8_t mask = 255, uint8_t shift = 0) {
     this->m_data[idx] &= ~(mask << shift);
     this->m_data[idx] |= (value << shift);

diff --git a/src/Appliance/AirConditioner/StatusData.cpp b/src/Appliance/AirConditioner/StatusData.cpp
@@ -48,6 +48,17 @@ void StatusData::setMode(Mode mode) {
   }
 }
 
+FanMode StatusData::getFanMode() const {
+  //some ACs return 30 for LOW and 50 for MEDIUM. Note though, in appMode, this device still uses 40/60
+  uint8_t fanMode = this->m_getValue(3);
+  if (fanMode == 30) {
+    fanMode = FAN_LOW;
+  } else if (fanMode == 50) {
+    fanMode = FAN_MEDIUM;
+  }
+  return static_cast<FanMode>(fanMode); 
+}
+
 Preset StatusData::getPreset() const {
   if (this->m_getEco())
     return Preset::PRESET_ECO;

diff --git a/src/Frame/FrameData.cpp b/src/Frame/FrameData.cpp
@@ -31,6 +31,12 @@ uint8_t FrameData::m_calcCRC() const {
   return crc;
 }
 
+uint8_t FrameData::m_getValue(uint8_t idx, uint8_t mask, uint8_t shift) const {
+  if (idx < this->m_data.size())
+    return (this->m_data[idx] >> shift) & mask;
+  return 0;
+}
+
 void NetworkNotifyData::setIP(const IPAddress &ip) {
   this->m_data[3] = ip[3];
   this->m_data[4] = ip[2];