Fixed code lints and decodeFujitsuAC264

Author: shimmy-void

src/IRrecv.cpp

@@ -698,7 +698,10 @@ bool IRrecv::decode(decode_results *results, irparams_t *save,
     // Fujitsu A/C needs to precede Panasonic and Denon as it has a short
     // message which looks exactly the same as a Panasonic/Denon message.
     DPRINTLN("Attempting Fujitsu A/C264 decode");
-    if (decodeFujitsuAC264(results, offset)) return true;
+    if (decodeFujitsuAC264(results, offset, kFujitsuAc264Bits) ||
+        decodeFujitsuAC264(results, offset, kFujitsuAc264BitsMiddle) ||
+        decodeFujitsuAC264(results, offset, kFujitsuAc264BitsShort))
+      return true;
 #endif
 #if DECODE_DENON
     // Denon needs to precede Panasonic as it is a special case of Panasonic.

src/ir_Fujitsu.cpp

@@ -1202,21 +1202,28 @@ bool IRFujitsuAC264::setRaw(const uint8_t newState[], const uint16_t length) {
   }
   switch (length) {
     case kFujitsuAc264StateLengthShort:
-      if (std::memcmp(_.raw, kFujitsuAc264StatesTurnOff, kFujitsuAc264StateLengthShort) == 0)
+      if (std::memcmp(_.raw, kFujitsuAc264StatesTurnOff,
+                      kFujitsuAc264StateLengthShort) == 0)
         _cmd = kFujitsuAc264SpCmdTurnOff;
-      if (std::memcmp(_.raw, kFujitsuAc264StatesTogglePowerful, kFujitsuAc264StateLengthShort) == 0)
+      if (std::memcmp(_.raw, kFujitsuAc264StatesTogglePowerful,
+                      kFujitsuAc264StateLengthShort) == 0)
         _cmd = kFujitsuAc264SpCmdTogglePowerful;
-      if (std::memcmp(_.raw, kFujitsuAc264StatesEcoFanOff, kFujitsuAc264StateLengthShort) == 0)
+      if (std::memcmp(_.raw, kFujitsuAc264StatesEcoFanOff,
+                      kFujitsuAc264StateLengthShort) == 0)
         _cmd = kFujitsuAc264SpCmdEcoFanOff;
-      if (std::memcmp(_.raw, kFujitsuAc264StatesEcoFanOn, kFujitsuAc264StateLengthShort) == 0) 
+      if (std::memcmp(_.raw, kFujitsuAc264StatesEcoFanOn,
+                      kFujitsuAc264StateLengthShort) == 0)
         _cmd = kFujitsuAc264SpCmdEcoFanOn;
       break;
     case kFujitsuAc264StateLengthMiddle:
-      if (std::memcmp(_.raw, kFujitsuAc264StatesOutsideQuietOff, kFujitsuAc264StateLengthMiddle) == 0)
+      if (std::memcmp(_.raw, kFujitsuAc264StatesOutsideQuietOff,
+                      kFujitsuAc264StateLengthMiddle) == 0)
         _cmd = kFujitsuAc264SpCmdOutsideQuietOff;
-      if (std::memcmp(_.raw, kFujitsuAc264StatesOutsideQuietOn, kFujitsuAc264StateLengthMiddle) == 0)
+      if (std::memcmp(_.raw, kFujitsuAc264StatesOutsideQuietOn,
+                      kFujitsuAc264StateLengthMiddle) == 0)
         _cmd = kFujitsuAc264SpCmdOutsideQuietOn;
-      if (std::memcmp(_.raw, kFujitsuAc264StatesToggleSterilization, kFujitsuAc264StateLengthMiddle) == 0)
+      if (std::memcmp(_.raw, kFujitsuAc264StatesToggleSterilization,
+                      kFujitsuAc264StateLengthMiddle) == 0)
         _cmd = kFujitsuAc264SpCmdToggleSterilization;
       break;
     case kFujitsuAc264StateLength:
@@ -1246,7 +1253,8 @@ bool IRFujitsuAC264::validChecksum(uint8_t state[], const uint16_t length) {
     checksum = state[kFujitsuAc264StateLengthMiddle - 1];
     sum = sumBytes(state, kFujitsuAc264StateLengthMiddle - 1);
     sum_complement = 0x9E;
-  } else if (length == kFujitsuAc264StateLength){    // The current command is normal
+  // The current command is normal
+  } else if (length == kFujitsuAc264StateLength) {
     checksum = state[kFujitsuAc264StateLength - 1];
     sum = sumBytes(state, kFujitsuAc264StateLength - 1);
     sum_complement = 0xAF;
@@ -1271,7 +1279,7 @@ void IRFujitsuAC264::checkSum(void) {
     _.raw[25] = 0x00;
     _.raw[26] = 0x00;
     _.raw[27] = 0x00;
-    _.raw[28] |= 0xF0; 
+    _.raw[28] |= 0xF0;
     _.raw[29] = 0xFF;
     _.raw[30] = 0xFF;
 
@@ -1284,7 +1292,8 @@ void IRFujitsuAC264::checkSum(void) {
 }
 
 /// Is the current command a special command?
-/// @return True, if special command (kFujitsuAc264SpCmd*); false, if normal command (kFujitsuAc264Cmd*).
+/// @return True, if special command (kFujitsuAc264SpCmd*);
+///         false, if normal command (kFujitsuAc264Cmd*).
 bool IRFujitsuAC264::isSpecialCommand(void) const {
   return (_cmd & 0xF0) == 0xF0;
 }
@@ -1328,7 +1337,8 @@ void IRFujitsuAC264::setPower(const bool on) {
     _cmd = kFujitsuAc264CmdCool;
   } else {
     _cmd = kFujitsuAc264SpCmdTurnOff;
-    std::memcpy(_.raw, kFujitsuAc264StatesTurnOff, kFujitsuAc264StateLengthShort);
+    std::memcpy(_.raw, kFujitsuAc264StatesTurnOff,
+                kFujitsuAc264StateLengthShort);
   }
 }
 
@@ -1338,7 +1348,7 @@ bool IRFujitsuAC264::getPower(void) const { return _ispoweredon; }
 
 /// Check if the temperature setting is changed.
 /// @return True if the temperature is not changed.
-bool IRFujitsuAC264::isTempStayed(void) const { return _settemp == _.Temp; };
+bool IRFujitsuAC264::isTempStayed(void) const { return _settemp == _.Temp; }
 
 /// Set the temperature.
 /// @param[in] temp The temperature in degrees Celcius.
@@ -1363,7 +1373,7 @@ void IRFujitsuAC264::setTemp(const float temp) {
 /// Get the current temperature setting.
 /// @return The current setting for temperature in degrees Celcius.
 float IRFujitsuAC264::getTemp(void) const {
-  return (float)(_.Temp / 2.0) + (kFujitsuAc264TempOffsetC / 2);
+  return static_cast<float>(_.Temp / 2.0) + (kFujitsuAc264TempOffsetC / 2);
 }
 
 /// Set the temperature in auto mode.
@@ -1386,7 +1396,7 @@ void IRFujitsuAC264::setTempAuto(const float temp) {
 /// Get the current temperature in auto mode setting.
 /// @return The current setting for temp in auto mode in degrees Celcius.
 float IRFujitsuAC264::getTempAuto(void) const {
-  return (float) ((int8_t) (_.TempAuto) / 10.0);
+  return static_cast<float>(static_cast<int8_t>(_.TempAuto) / 10.0);
 }
 
 /// Set the operating mode of the A/C.
@@ -1429,18 +1439,19 @@ uint8_t IRFujitsuAC264::getMode(void) const { return _.Mode; }
 
 /// Get the weak dry mode setting of the A/C.
 /// @return The weak dry mode setting.
-bool IRFujitsuAC264::isWeakDry(void) const { return _.WeakDry; };
+bool IRFujitsuAC264::isWeakDry(void) const { return _.WeakDry; }
 
 /// Set the speed of the fan.
 /// @param[in] fanSpeed The desired setting.
 void IRFujitsuAC264::setFanSpeed(const uint8_t fanSpeed) {
+  // Set the fan to auto if out of range.
   if ((fanSpeed == kFujitsuAc264FanSpeedQuiet) ||
       (fanSpeed == kFujitsuAc264FanSpeedLow) ||
       (fanSpeed == kFujitsuAc264FanSpeedMed) ||
       (fanSpeed == kFujitsuAc264FanSpeedHigh))
     _.FanSpeed = fanSpeed;
   else
-    _.FanSpeed = kFujitsuAc264FanSpeedAuto; // Set the fan to auto if out of range.
+    _.FanSpeed = kFujitsuAc264FanSpeedAuto;
   _cmd = _.Cmd = kFujitsuAc264CmdFanSpeed;
   _.SubCmd = 0;
 }
@@ -1452,9 +1463,10 @@ uint8_t IRFujitsuAC264::getFanSpeed(void) const { return _.FanSpeed; }
 /// Set the angle of the fan.
 /// @param[in] fanAngle The desired setting.
 void IRFujitsuAC264::setFanAngle(const uint8_t fanAngle) {
+  // Set the fan to stay if out of range.
   if ((fanAngle > kFujitsuAc264FanAngle7) ||
       (fanAngle < kFujitsuAc264FanAngle1)) {
-    _.FanAngle = kFujitsuAc264FanAngleStay;  // Set the fan to stay if out of range.
+    _.FanAngle = kFujitsuAc264FanAngleStay;
   } else {
     _.FanAngle = fanAngle;
   }
@@ -1509,7 +1521,8 @@ void IRFujitsuAC264::toggleSterilization(void) {
   if (getPower())
     return;
   _cmd = kFujitsuAc264SpCmdToggleSterilization;
-  std::memcpy(_.raw, kFujitsuAc264StatesToggleSterilization, kFujitsuAc264StateLengthMiddle);
+  std::memcpy(_.raw, kFujitsuAc264StatesToggleSterilization,
+              kFujitsuAc264StateLengthMiddle);
 }
 
 /// Set weather outside quiet mode is enabled or not.
@@ -1520,10 +1533,12 @@ void IRFujitsuAC264::setOutsideQuiet(const bool on) {
     return;
   if (on) {
     _cmd = kFujitsuAc264SpCmdOutsideQuietOn;
-    std::memcpy(_.raw, kFujitsuAc264StatesOutsideQuietOn, kFujitsuAc264StateLengthMiddle);
+    std::memcpy(_.raw, kFujitsuAc264StatesOutsideQuietOn,
+                kFujitsuAc264StateLengthMiddle);
   } else {
     _cmd = kFujitsuAc264SpCmdOutsideQuietOff;
-    std::memcpy(_.raw, kFujitsuAc264StatesOutsideQuietOff, kFujitsuAc264StateLengthMiddle);
+    std::memcpy(_.raw, kFujitsuAc264StatesOutsideQuietOff,
+                kFujitsuAc264StateLengthMiddle);
   }
 }
 
@@ -1539,10 +1554,12 @@ void IRFujitsuAC264::setEcoFan(const bool on) {
     return;
   if (on) {
     _cmd = kFujitsuAc264SpCmdEcoFanOn;
-    std::memcpy(_.raw, kFujitsuAc264StatesEcoFanOn, kFujitsuAc264StateLengthShort);
+    std::memcpy(_.raw, kFujitsuAc264StatesEcoFanOn,
+                kFujitsuAc264StateLengthShort);
   } else {
     _cmd = kFujitsuAc264SpCmdEcoFanOff;
-    std::memcpy(_.raw, kFujitsuAc264StatesEcoFanOff, kFujitsuAc264StateLengthShort);
+    std::memcpy(_.raw, kFujitsuAc264StatesEcoFanOff,
+                kFujitsuAc264StateLengthShort);
   }
 }
 
@@ -1556,7 +1573,8 @@ void IRFujitsuAC264::togglePowerful(void) {
   if (!getPower())
     return;
   _cmd = kFujitsuAc264SpCmdTogglePowerful;
-  std::memcpy(_.raw, kFujitsuAc264StatesTogglePowerful, kFujitsuAc264StateLengthShort);
+  std::memcpy(_.raw, kFujitsuAc264StatesTogglePowerful,
+              kFujitsuAc264StateLengthShort);
 }
 
 /// Set the clock on the A/C unit.
@@ -1633,30 +1651,35 @@ void IRFujitsuAC264::setTimerEnable(const uint8_t timer_enable) {
 uint8_t IRFujitsuAC264::getTimerEnable(void) const { return _.TimerEnable; }
 
 /// Set the on timer setting of the A/C.
-/// @param[in] mins10 Time in 10 minutes unit, when the A/C will turn on. 0 means 0:00 AM, 1 means 0:10 AM.
+/// @param[in] mins10 Time in 10 minutes unit, when the A/C will turn on.
+///                   0 means 0:00 AM, 1 means 0:10 AM.
 void IRFujitsuAC264::setOnTimer(const uint8_t mins10) {
   if (mins10 <= kFujitsuAc26OnOffTimerMax)
     _.OnTimer = mins10;
 }
 
 /// Get the on timer setting of the A/C.
-/// @return Time in 10 minutes unit, when the A/C will turn on. 0 means 0:00 AM, 1 means 0:10 AM.
+/// @return Time in 10 minutes unit, when the A/C will turn on.
+///         0 means 0:00 AM, 1 means 0:10 AM.
 uint8_t IRFujitsuAC264::getOnTimer(void) const { return _.OnTimer; }
 
 /// Set the off timer setting of the A/C.
-/// @param[in] mins10 Time in 10 minutes unit, when the A/C will turn off. 0 means 0:00 AM, 1 means 0:10 AM.
+/// @param[in] mins10 Time in 10 minutes unit, when the A/C will turn off.
+///                   0 means 0:00 AM, 1 means 0:10 AM.
 void IRFujitsuAC264::setOffTimer(const uint8_t mins10) {
   if (mins10 <= kFujitsuAc26OnOffTimerMax)
     _.OffTimer = mins10;
 }
 
 /// Get the off timer setting of the A/C.
-/// @return Time in 10 minutes unit, when the A/C will turn off. 0 means 0:00 AM, 1 means 0:10 AM.
+/// @return Time in 10 minutes unit, when the A/C will turn off.
+///         0 means 0:00 AM, 1 means 0:10 AM.
 uint8_t IRFujitsuAC264::getOffTimer(void) const { return _.OffTimer; }
 
 /// Set the requested (normal) command part for the A/C message.
 /// @param[in] cmd Command to be set.
-/// @note Only normal commands (=!isSpecialCommand()) can be set with this function.
+/// @note Only normal commands (=!isSpecialCommand()) can be set
+///       with this function.
 void IRFujitsuAC264::setCmd(const uint8_t cmd) {
   switch (cmd) {
     case kFujitsuAc264CmdCool:
@@ -1754,8 +1777,8 @@ stdAc::state_t IRFujitsuAC264::toCommon(const stdAc::state_t *prev) {
   result.protocol = decode_type_t::FUJITSU_AC264;
   checkSum();
   result.power = _cmd != kFujitsuAc264SpCmdTurnOff;
-  // Only update these settings if it is not a special command message, or we have no previous
-  // state info for those settings.
+  // Only update these settings if it is not a special command message,
+  // or we have no previous state info for those settings.
   if (!isSpecialCommand() || prev == NULL) {
     result.mode = toCommonMode(_.Mode);
     result.celsius = true;
@@ -1819,23 +1842,23 @@ String IRFujitsuAC264::toString(void) const {
   } else {    // Normal commands
     result += addBoolToString(true, kPowerStr, false);
     // Mode
-    result += addModeToString(_.Mode, kFujitsuAc264ModeAuto, kFujitsuAc264ModeCool,
-                              kFujitsuAc264ModeHeat, kFujitsuAc264ModeDry,
-                              kFujitsuAc264ModeFan);
+    result += addModeToString(_.Mode, kFujitsuAc264ModeAuto,
+                kFujitsuAc264ModeCool, kFujitsuAc264ModeHeat,
+                kFujitsuAc264ModeDry, kFujitsuAc264ModeFan);
     // Temp
     float degrees = getTemp();
     result += addTempFloatToString(getTemp());
     // Temp in Auto
     degrees = getTempAuto();
-    String degrees_str = (degrees >= 0)? uint64ToString(degrees): 
-                                         String(kDashStr) + uint64ToString(-degrees);
+    String degrees_str = (degrees >= 0)? uint64ToString(degrees):
+                          String(kDashStr) + uint64ToString(-degrees);
     result += addLabeledString(degrees_str, "Temp (Auto)");
     if (((uint16_t)(2 * degrees)) & 1) result += F(".5");
     result += 'C';
     // Fan Speed
-    result += addFanToString(_.FanSpeed, kFujitsuAc264FanSpeedHigh, kFujitsuAc264FanSpeedLow,
-                             kFujitsuAc264FanSpeedAuto, kFujitsuAc264FanSpeedQuiet,
-                             kFujitsuAc264FanSpeedMed);
+    result += addFanToString(_.FanSpeed, kFujitsuAc264FanSpeedHigh,
+                kFujitsuAc264FanSpeedLow, kFujitsuAc264FanSpeedAuto,
+                kFujitsuAc264FanSpeedQuiet, kFujitsuAc264FanSpeedMed);
     // Fan Angle
     result += addIntToString(_.FanAngle, "Fan Angle");
     result += kSpaceLBraceStr;
@@ -2005,12 +2028,13 @@ bool IRrecv::decodeFujitsuAC264(decode_results* results, uint16_t offset,
       results->state[2] != 0x00 || results->state[3] != 0x10 ||
       results->state[4] != 0x10)
       return false;
-  
+
   // Identify which command it is
   switch (results->state[5]) {
     case 0xFE:    // Command length is normal or middle
       restLength = results->state[6];
-      if ((restLength != 0x1A) && (restLength != 0x09))   // check the rest length
+      // check the rest length
+      if ((restLength != 0x1A) && (restLength != 0x09))
         return false;
       break;
     case 0x51:    // Command length is short
@@ -2031,8 +2055,8 @@ bool IRrecv::decodeFujitsuAC264(decode_results* results, uint16_t offset,
   // Keep reading bytes until we either run out of message or state to fill.
   match_result_t data_result;
   for (uint16_t i = kFujitsuAc264StateLengthShort;
-       offset <= results->rawlen - 16 && i < kFujitsuAc264StateLengthShort + restLength;
-       i++, dataBitsSoFar += 8, offset += data_result.used) {
+       offset <= results->rawlen - 16 && i < kFujitsuAc264StateLengthShort + 
+       restLength; i++, dataBitsSoFar += 8, offset += data_result.used) {
     data_result = matchData(
         &(results->rawbuf[offset]), 8, kFujitsuAcBitMark, kFujitsuAcOneSpace,
         kFujitsuAcBitMark, kFujitsuAcZeroSpace,

src/ir_Fujitsu.h

@@ -301,30 +301,40 @@ const uint8_t kFujitsuAc264OnOffTimerEnable = 0x3;        // 0b0011
 const uint16_t kFujitsuAc26OnOffTimerMax = 24 * 6 - 1;    ///< 10 Minutes.
 
 /// Special command for Power Off
-const uint8_t kFujitsuAc264StatesTurnOff[kFujitsuAc264StateLengthShort] = {
+const uint8_t kFujitsuAc264StatesTurnOff
+                [kFujitsuAc264StateLengthShort] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0x02, 0xFD};
 /// Special command for Toggle Powerful
-const uint8_t kFujitsuAc264StatesTogglePowerful[kFujitsuAc264StateLengthShort] = {
+const uint8_t kFujitsuAc264StatesTogglePowerful
+                [kFujitsuAc264StateLengthShort] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0x39, 0xC6};
 /// Special command for Eco Fan Off
-const uint8_t kFujitsuAc264StatesEcoFanOff[kFujitsuAc264StateLengthShort] = {
+const uint8_t kFujitsuAc264StatesEcoFanOff
+                [kFujitsuAc264StateLengthShort] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0x51, 0xAE};
 /// Special command for Eco Fan On
-const uint8_t kFujitsuAc264StatesEcoFanOn[kFujitsuAc264StateLengthShort] = {
+const uint8_t kFujitsuAc264StatesEcoFanOn
+                [kFujitsuAc264StateLengthShort] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0x50, 0xAF};
 /// Special command for Outside Quiet Off
-/// @note This command uses the same protocol with FujitsuAC's ARRAH2E, but has different meaning.
-const uint8_t kFujitsuAc264StatesOutsideQuietOff[kFujitsuAc264StateLengthMiddle] = {
+/// @note This command uses the same protocol with FujitsuAC's ARRAH2E,
+///       but has different meaning.
+const uint8_t kFujitsuAc264StatesOutsideQuietOff
+                [kFujitsuAc264StateLengthMiddle] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0xFE, 0x09, 0xC1,
   0x40, 0x01, 0x00, 0x00, 0xFE, 0xBF, 0x00, 0x41};
 /// Special command for Outside Quiet Off
-/// @note This command uses the same protocol with FujitsuAC's ARRAH2E, but has different meaning.
-const uint8_t kFujitsuAc264StatesOutsideQuietOn[kFujitsuAc264StateLengthMiddle] = {
+/// @note This command uses the same protocol with FujitsuAC's ARRAH2E,
+///       but has different meaning.
+const uint8_t kFujitsuAc264StatesOutsideQuietOn
+                [kFujitsuAc264StateLengthMiddle] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0xFE, 0x09, 0xC1,
   0x40, 0x00, 0x00, 0x00, 0xFF, 0xBF, 0x00, 0x41};
 /// Special command for Toggle Sterilization
-/// @note This command uses the same protocol with FujitsuAC's ARRAH2E, but has different meaning.
-const uint8_t kFujitsuAc264StatesToggleSterilization[kFujitsuAc264StateLengthMiddle] = {
+/// @note This command uses the same protocol with FujitsuAC's ARRAH2E,
+///       but has different meaning.
+const uint8_t kFujitsuAc264StatesToggleSterilization
+                [kFujitsuAc264StateLengthMiddle] = {
   0x14, 0x63, 0x00, 0x10, 0x10, 0xFE, 0x09, 0xC1,
   0x60, 0x03, 0x00, 0x00, 0xFC, 0x9F, 0x00, 0x41};