breeze/IRremoteESP8266
1
0
Fork 0
mirror of https://github.com/crankyoldgit/IRremoteESP8266.git synced 2026-01-12 00:05:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Daikin176: Add support for Unit Id. (#1544)

Browse Source 
* Add `IRDaikin176:setId()` & `IRDaikin176:getId()` for dealing with Unit Identifiers.
* Add "Id:" to `.toString()` output.
* Add unit test coverage for that, and update existing tests.
* Misc code style cleanups.

Fixes #1543
This commit is contained in:
David Conran
2021-08-01 23:28:11 +10:00
committed by GitHub
parent b6368bd692
commit 89ead22db1
4 changed files with 270 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

274
src/ir_Daikin.cpp
View File

@@ -1,6 +1,6 @@
// Copyright 2016 sillyfrog
// Copyright 2017 sillyfrog, crankyoldgit
// Copyright 2018-2020 crankyoldgit
// Copyright 2018-2021 crankyoldgit
// Copyright 2019 pasna (IRDaikin160 class / Daikin176 class)
/// @file
@@ -1493,21 +1493,15 @@ void IRDaikin216::off(void) { setPower(false); }
/// Change the power setting.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin216::setPower(const bool on) {
_.Power = on;
}
void IRDaikin216::setPower(const bool on) { _.Power = on; }
/// Get the value of the current power setting.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin216::getPower(void) const {
return _.Power;
}
bool IRDaikin216::getPower(void) const { return _.Power; }
/// Get the operating mode setting of the A/C.
/// @return The current operating mode setting.
uint8_t IRDaikin216::getMode(void) const {
return _.Mode;
}
uint8_t IRDaikin216::getMode(void) const { return _.Mode; }
/// Set the operating mode of the A/C.
/// @param[in] mode The desired operating mode.
@@ -1542,9 +1536,7 @@ void IRDaikin216::setTemp(const uint8_t temp) {
/// Get the current temperature setting.
/// @return The current setting for temp. in degrees celsius.
uint8_t IRDaikin216::getTemp(void) const {
return _.Temp;
}
uint8_t IRDaikin216::getTemp(void) const { return _.Temp; }
/// Set the speed of the fan.
/// @param[in] fan The desired setting.
@@ -1584,9 +1576,7 @@ void IRDaikin216::setSwingVertical(const bool on) {
/// Get the Vertical Swing mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin216::getSwingVertical(void) const {
return _.SwingV;
}
bool IRDaikin216::getSwingVertical(void) const { return _.SwingV; }
/// Set the Horizontal Swing mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -1596,9 +1586,7 @@ void IRDaikin216::setSwingHorizontal(const bool on) {
/// Get the Horizontal Swing mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin216::getSwingHorizontal(void) const {
return _.SwingH;
}
bool IRDaikin216::getSwingHorizontal(void) const { return _.SwingH; }
/// Set the Quiet mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -1616,9 +1604,7 @@ void IRDaikin216::setQuiet(const bool on) {
/// Get the Quiet mode status of the A/C.
/// @return true, the setting is on. false, the setting is off.
/// @note This is a horrible hack till someone works out the quiet mode bit.
bool IRDaikin216::getQuiet(void) const {
return getFan() == kDaikinFanQuiet;
}
bool IRDaikin216::getQuiet(void) const { return getFan() == kDaikinFanQuiet; }
/// Set the Powerful (Turbo) mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -1630,9 +1616,7 @@ void IRDaikin216::setPowerful(const bool on) {
/// Get the Powerful (Turbo) mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin216::getPowerful(void) const {
return _.Powerful;
}
bool IRDaikin216::getPowerful(void) const { return _.Powerful; }
/// Convert the current internal state into its stdAc::state_t equivalent.
/// @return The stdAc equivalent of the native settings.
@@ -1852,21 +1836,15 @@ void IRDaikin160::off(void) { setPower(false); }
/// Change the power setting.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin160::setPower(const bool on) {
_.Power = on;
}
void IRDaikin160::setPower(const bool on) { _.Power = on; }
/// Get the value of the current power setting.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin160::getPower(void) const {
return _.Power;
}
bool IRDaikin160::getPower(void) const { return _.Power; }
/// Get the operating mode setting of the A/C.
/// @return The current operating mode setting.
uint8_t IRDaikin160::getMode(void) const {
return _.Mode;
}
uint8_t IRDaikin160::getMode(void) const { return _.Mode; }
/// Set the operating mode of the A/C.
/// @param[in] mode The desired operating mode.
@@ -1900,9 +1878,7 @@ void IRDaikin160::setTemp(const uint8_t temp) {
/// Get the current temperature setting.
/// @return The current setting for temp. in degrees celsius.
uint8_t IRDaikin160::getTemp(void) const {
return _.Temp + 10;
}
uint8_t IRDaikin160::getTemp(void) const { return _.Temp + 10; }
/// Set the speed of the fan.
/// @param[in] fan The desired setting.
@@ -1959,9 +1935,7 @@ void IRDaikin160::setSwingVertical(const uint8_t position) {
/// Get the Vertical Swing mode of the A/C.
/// @return The native position/mode setting.
uint8_t IRDaikin160::getSwingVertical(void) const {
return _.SwingV;
}
uint8_t IRDaikin160::getSwingVertical(void) const { return _.SwingV; }
/// Convert a stdAc::swingv_t enum into it's native setting.
/// @param[in] position The enum to be converted.
@@ -2224,15 +2198,11 @@ void IRDaikin176::setPower(const bool on) {
/// Get the value of the current power setting.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin176::getPower(void) const {
return _.Power;
}
bool IRDaikin176::getPower(void) const { return _.Power; }
/// Get the operating mode setting of the A/C.
/// @return The current operating mode setting.
uint8_t IRDaikin176::getMode(void) const {
return _.Mode;
}
uint8_t IRDaikin176::getMode(void) const { return _.Mode; }
/// Set the operating mode of the A/C.
/// @param[in] mode The desired operating mode.
@@ -2300,9 +2270,7 @@ void IRDaikin176::setTemp(const uint8_t temp) {
/// Get the current temperature setting.
/// @return The current setting for temp. in degrees celsius.
uint8_t IRDaikin176::getTemp(void) const {
return _.Temp + 9;
}
uint8_t IRDaikin176::getTemp(void) const { return _.Temp + 9; }
/// Set the speed of the fan.
/// @param[in] fan The desired setting.
@@ -2322,9 +2290,7 @@ void IRDaikin176::setFan(const uint8_t fan) {
/// Get the current fan speed setting.
/// @return The current fan speed.
uint8_t IRDaikin176::getFan(void) const {
return _.Fan;
}
uint8_t IRDaikin176::getFan(void) const { return _.Fan; }
/// Convert a stdAc::fanspeed_t enum into it's native speed.
/// @param[in] speed The enum to be converted.
@@ -2351,9 +2317,16 @@ void IRDaikin176::setSwingHorizontal(const uint8_t position) {
/// Get the Horizontal Swing mode of the A/C.
/// @return The native position/mode setting.
uint8_t IRDaikin176::getSwingHorizontal(void) const {
return _.SwingH;
}
uint8_t IRDaikin176::getSwingHorizontal(void) const { return _.SwingH; }
/// Get the Unit Id of the A/C.
/// @return The Unit Id the A/C is to use.
uint8_t IRDaikin176::getId(void) const { return _.Id1; }
/// Set the Unit Id of the A/C.
/// @param[in] num The Unit Id the A/C is to use.
/// @note 0 for Unit A; 1 for Unit B
void IRDaikin176::setId(const uint8_t num) { _.Id1 = _.Id2 = num; }
/// Convert a stdAc::swingh_t enum into it's native setting.
/// @param[in] position The enum to be converted.
@@ -2417,7 +2390,7 @@ stdAc::state_t IRDaikin176::toCommon(void) const {
/// @return A human readable string.
String IRDaikin176::toString(void) const {
String result = "";
result.reserve(80); // Reserve some heap for the string to reduce fragging.
result.reserve(90); // Reserve some heap for the string to reduce fragging.
result += addBoolToString(_.Power, kPowerStr, false);
result += addModeToString(_.Mode, kDaikin176Auto, kDaikin176Cool,
kDaikin176Heat, kDaikin176Dry, kDaikin176Fan);
@@ -2436,6 +2409,7 @@ String IRDaikin176::toString(void) const {
kDaikin176SwingHAuto,
kDaikin176SwingHAuto,
kDaikin176SwingHAuto);
result += addIntToString(_.Id1, kIdStr);
return result;
}
@@ -2602,21 +2576,15 @@ void IRDaikin128::send(const uint16_t repeat) {
/// Set the Power toggle setting of the A/C.
/// @param[in] toggle true, the setting is on. false, the setting is off.
void IRDaikin128::setPowerToggle(const bool toggle) {
_.Power = toggle;
}
void IRDaikin128::setPowerToggle(const bool toggle) { _.Power = toggle; }
/// Get the Power toggle setting of the A/C.
/// @return The current operating mode setting.
bool IRDaikin128::getPowerToggle(void) const {
return _.Power;
}
bool IRDaikin128::getPowerToggle(void) const { return _.Power; }
/// Get the operating mode setting of the A/C.
/// @return The current operating mode setting.
uint8_t IRDaikin128::getMode(void) const {
return _.Mode;
}
uint8_t IRDaikin128::getMode(void) const { return _.Mode; }
/// Set the operating mode of the A/C.
/// @param[in] mode The desired operating mode.
@@ -2673,15 +2641,11 @@ void IRDaikin128::setTemp(const uint8_t temp) {
/// Get the current temperature setting.
/// @return The current setting for temp. in degrees celsius.
uint8_t IRDaikin128::getTemp(void) const {
return bcdToUint8(_.Temp);
}
uint8_t IRDaikin128::getTemp(void) const { return bcdToUint8(_.Temp); }
/// Get the current fan speed setting.
/// @return The current fan speed.
uint8_t IRDaikin128::getFan(void) const {
return _.Fan;
}
uint8_t IRDaikin128::getFan(void) const { return _.Fan; }
/// Set the speed of the fan.
/// @param[in] speed The desired setting.
@@ -2735,27 +2699,19 @@ stdAc::fanspeed_t IRDaikin128::toCommonFanSpeed(const uint8_t speed) {
/// Set the Vertical Swing mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin128::setSwingVertical(const bool on) {
_.SwingV = on;
}
void IRDaikin128::setSwingVertical(const bool on) { _.SwingV = on; }
/// Get the Vertical Swing mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin128::getSwingVertical(void) const {
return _.SwingV;
}
bool IRDaikin128::getSwingVertical(void) const { return _.SwingV; }
/// Set the Sleep mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin128::setSleep(const bool on) {
_.Sleep = on;
}
void IRDaikin128::setSleep(const bool on) { _.Sleep = on; }
/// Get the Sleep mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin128::getSleep(void) const {
return _.Sleep;
}
bool IRDaikin128::getSleep(void) const { return _.Sleep; }
/// Set the Economy mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -2766,9 +2722,7 @@ void IRDaikin128::setEcono(const bool on) {
/// Get the Economical mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin128::getEcono(void) const {
return _.Econo;
}
bool IRDaikin128::getEcono(void) const { return _.Econo; }
/// Set the Quiet mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -2782,9 +2736,7 @@ void IRDaikin128::setQuiet(const bool on) {
/// Get the Quiet mode status of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin128::getQuiet(void) const {
return _.Fan == kDaikin128FanQuiet;
}
bool IRDaikin128::getQuiet(void) const { return _.Fan == kDaikin128FanQuiet; }
/// Set the Powerful (Turbo) mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -2821,15 +2773,11 @@ uint16_t IRDaikin128::getClock(void) const {
/// Set the enable status of the On Timer.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin128::setOnTimerEnabled(const bool on) {
_.OnTimer = on;
}
void IRDaikin128::setOnTimerEnabled(const bool on) { _.OnTimer = on; }
/// Get the enable status of the On Timer.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin128::getOnTimerEnabled(void) const {
return _.OnTimer;
}
bool IRDaikin128::getOnTimerEnabled(void) const { return _.OnTimer; }
#define SETTIME(x, n) do { \
uint16_t mins = n;\
@@ -2848,21 +2796,15 @@ void IRDaikin128::setOnTimer(const uint16_t mins_since_midnight) {
/// Get the On Timer time to be sent to the A/C unit.
/// @return The number of minutes past midnight.
uint16_t IRDaikin128::getOnTimer(void) const {
return GETTIME(On);
}
uint16_t IRDaikin128::getOnTimer(void) const { return GETTIME(On); }
/// Set the enable status of the Off Timer.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin128::setOffTimerEnabled(const bool on) {
_.OffTimer = on;
}
void IRDaikin128::setOffTimerEnabled(const bool on) { _.OffTimer = on; }
/// Get the enable status of the Off Timer.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin128::getOffTimerEnabled(void) const {
return _.OffTimer;
}
bool IRDaikin128::getOffTimerEnabled(void) const { return _.OffTimer; }
/// Set the Off Timer time for the A/C unit.
/// @param[in] mins_since_midnight Nr. of minutes past midnight.
@@ -2872,9 +2814,7 @@ void IRDaikin128::setOffTimer(const uint16_t mins_since_midnight) {
/// Get the Off Timer time to be sent to the A/C unit.
/// @return The number of minutes past midnight.
uint16_t IRDaikin128::getOffTimer(void) const {
return GETTIME(Off);
}
uint16_t IRDaikin128::getOffTimer(void) const { return GETTIME(Off); }
/// Set the Light toggle setting of the A/C.
/// @param[in] unit Device to show the LED (Light) Display info about.
@@ -3182,21 +3122,15 @@ void IRDaikin152::off(void) { setPower(false); }
/// Change the power setting.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin152::setPower(const bool on) {
_.Power = on;
}
void IRDaikin152::setPower(const bool on) { _.Power = on; }
/// Get the value of the current power setting.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getPower(void) const {
return _.Power;
}
bool IRDaikin152::getPower(void) const { return _.Power; }
/// Get the operating mode setting of the A/C.
/// @return The current operating mode setting.
uint8_t IRDaikin152::getMode(void) const {
return _.Mode;
}
uint8_t IRDaikin152::getMode(void) const { return _.Mode; }
/// Set the operating mode of the A/C.
/// @param[in] mode The desired operating mode.
@@ -3238,9 +3172,7 @@ void IRDaikin152::setTemp(const uint8_t temp) {
/// Get the current temperature setting.
/// @return The current setting for temp. in degrees celsius.
uint8_t IRDaikin152::getTemp(void) const {
return _.Temp;
}
uint8_t IRDaikin152::getTemp(void) const { return _.Temp; }
/// Set the speed of the fan.
/// @param[in] fan The desired setting.
@@ -3283,9 +3215,7 @@ void IRDaikin152::setSwingV(const bool on) {
/// Get the Vertical Swing mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getSwingV(void) const {
return _.SwingV;
}
bool IRDaikin152::getSwingV(void) const { return _.SwingV; }
/// Set the Quiet mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -3297,9 +3227,7 @@ void IRDaikin152::setQuiet(const bool on) {
/// Get the Quiet mode status of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getQuiet(void) const {
return _.Quiet;
}
bool IRDaikin152::getQuiet(void) const { return _.Quiet; }
/// Set the Powerful (Turbo) mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -3315,9 +3243,7 @@ void IRDaikin152::setPowerful(const bool on) {
/// Get the Powerful (Turbo) mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getPowerful(void) const {
return _.Powerful;
}
bool IRDaikin152::getPowerful(void) const { return _.Powerful; }
/// Set the Economy mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -3329,21 +3255,15 @@ void IRDaikin152::setEcono(const bool on) {
/// Get the Economical mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getEcono(void) const {
return _.Econo;
}
bool IRDaikin152::getEcono(void) const { return _.Econo; }
/// Set the Sensor mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin152::setSensor(const bool on) {
_.Sensor = on;
}
void IRDaikin152::setSensor(const bool on) { _.Sensor = on; }
/// Get the Sensor mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getSensor(void) const {
return _.Sensor;
}
bool IRDaikin152::getSensor(void) const { return _.Sensor; }
/// Set the Comfort mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -3360,9 +3280,7 @@ void IRDaikin152::setComfort(const bool on) {
/// Get the Comfort mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin152::getComfort(void) const {
return _.Comfort;
}
bool IRDaikin152::getComfort(void) const { return _.Comfort; }
/// Convert the current internal state into its stdAc::state_t equivalent.
/// @return The stdAc equivalent of the native settings.
@@ -3531,14 +3449,10 @@ bool IRDaikin64::validChecksum(const uint64_t state) {
}
/// Calculate and set the checksum values for the internal state.
void IRDaikin64::checksum(void) {
_.Sum = calcChecksum(_.raw);
}
void IRDaikin64::checksum(void) { _.Sum = calcChecksum(_.raw); }
/// Reset the internal state to a fixed known good state.
void IRDaikin64::stateReset(void) {
_.raw = kDaikin64KnownGoodState;
}
void IRDaikin64::stateReset(void) { _.raw = kDaikin64KnownGoodState; }
/// Get a copy of the internal state as a valid code for this protocol.
/// @return A valid code for this protocol based on the current internal state.
@@ -3553,15 +3467,11 @@ void IRDaikin64::setRaw(const uint64_t new_state) { _.raw = new_state; }
/// Set the Power toggle setting of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin64::setPowerToggle(const bool on) {
_.Power = on;
}
void IRDaikin64::setPowerToggle(const bool on) { _.Power = on; }
/// Get the Power toggle setting of the A/C.
/// @return The current operating mode setting.
bool IRDaikin64::getPowerToggle(void) const {
return _.Power;
}
bool IRDaikin64::getPowerToggle(void) const { return _.Power; }
/// Set the temperature.
/// @param[in] temp The temperature in degrees celsius.
@@ -3573,15 +3483,11 @@ void IRDaikin64::setTemp(const uint8_t temp) {
/// Get the current temperature setting.
/// @return The current setting for temp. in degrees celsius.
uint8_t IRDaikin64::getTemp(void) const {
return bcdToUint8(_.Temp);
}
uint8_t IRDaikin64::getTemp(void) const { return bcdToUint8(_.Temp); }
/// Get the operating mode setting of the A/C.
/// @return The current operating mode setting.
uint8_t IRDaikin64::getMode(void) const {
return _.Mode;
}
uint8_t IRDaikin64::getMode(void) const { return _.Mode; }
/// Set the operating mode of the A/C.
/// @param[in] mode The desired operating mode.
@@ -3625,9 +3531,7 @@ stdAc::opmode_t IRDaikin64::toCommonMode(const uint8_t mode) {
/// Get the current fan speed setting.
/// @return The current fan speed.
uint8_t IRDaikin64::getFan(void) const {
return _.Fan;
}
uint8_t IRDaikin64::getFan(void) const { return _.Fan; }
/// Set the speed of the fan.
/// @param[in] speed The desired setting.
@@ -3676,9 +3580,7 @@ stdAc::fanspeed_t IRDaikin64::toCommonFanSpeed(const uint8_t speed) {
/// Get the Turbo (Powerful) mode status of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin64::getTurbo(void) const {
return _.Fan == kDaikin64FanTurbo;
}
bool IRDaikin64::getTurbo(void) const { return _.Fan == kDaikin64FanTurbo; }
/// Set the Turbo (Powerful) mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -3692,9 +3594,7 @@ void IRDaikin64::setTurbo(const bool on) {
/// Get the Quiet mode status of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin64::getQuiet(void) const {
return _.Fan == kDaikin64FanQuiet;
}
bool IRDaikin64::getQuiet(void) const { return _.Fan == kDaikin64FanQuiet; }
/// Set the Quiet mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
@@ -3708,27 +3608,19 @@ void IRDaikin64::setQuiet(const bool on) {
/// Set the Vertical Swing mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin64::setSwingVertical(const bool on) {
_.SwingV = on;
}
void IRDaikin64::setSwingVertical(const bool on) { _.SwingV = on; }
/// Get the Vertical Swing mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin64::getSwingVertical(void) const {
return _.SwingV;
}
bool IRDaikin64::getSwingVertical(void) const { return _.SwingV; }
/// Set the Sleep mode of the A/C.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin64::setSleep(const bool on) {
_.Sleep = on;
}
void IRDaikin64::setSleep(const bool on) { _.Sleep = on; }
/// Get the Sleep mode of the A/C.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin64::getSleep(void) const {
return _.Sleep;
}
bool IRDaikin64::getSleep(void) const { return _.Sleep; }
/// Set the clock on the A/C unit.
/// @param[in] mins_since_midnight Nr. of minutes past midnight.
@@ -3747,21 +3639,15 @@ uint16_t IRDaikin64::getClock(void) const {
/// Set the enable status of the On Timer.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin64::setOnTimeEnabled(const bool on) {
_.OnTimer = on;
}
void IRDaikin64::setOnTimeEnabled(const bool on) { _.OnTimer = on; }
/// Get the enable status of the On Timer.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin64::getOnTimeEnabled(void) const {
return _.OnTimer;
}
bool IRDaikin64::getOnTimeEnabled(void) const { return _.OnTimer; }
/// Get the On Timer time to be sent to the A/C unit.
/// @return The number of minutes past midnight.
uint16_t IRDaikin64::getOnTime(void) const {
return GETTIME(On);
}
uint16_t IRDaikin64::getOnTime(void) const { return GETTIME(On); }
/// Set the On Timer time for the A/C unit.
/// @param[in] mins_since_midnight Nr. of minutes past midnight.
@@ -3771,21 +3657,15 @@ void IRDaikin64::setOnTime(const uint16_t mins_since_midnight) {
/// Set the enable status of the Off Timer.
/// @param[in] on true, the setting is on. false, the setting is off.
void IRDaikin64::setOffTimeEnabled(const bool on) {
_.OffTimer = on;
}
void IRDaikin64::setOffTimeEnabled(const bool on) { _.OffTimer = on; }
/// Get the enable status of the Off Timer.
/// @return true, the setting is on. false, the setting is off.
bool IRDaikin64::getOffTimeEnabled(void) const {
return _.OffTimer;
}
bool IRDaikin64::getOffTimeEnabled(void) const { return _.OffTimer; }
/// Get the Off Timer time to be sent to the A/C unit.
/// @return The number of minutes past midnight.
uint16_t IRDaikin64::getOffTime(void) const {
return GETTIME(Off);
}
uint16_t IRDaikin64::getOffTime(void) const { return GETTIME(Off); }
/// Set the Off Timer time for the A/C unit.
/// @param[in] mins_since_midnight Nr. of minutes past midnight.

28
src/ir_Daikin.h
View File

@@ -1,6 +1,6 @@
// Copyright 2016 sillyfrog
// Copyright 2017 sillyfrog, crankyoldgit
// Copyright 2018-2020 crankyoldgit
// Copyright 2018-2021 crankyoldgit
// Copyright 2019 pasna (IRDaikin160 class / Daikin176 class)
/// @file
@@ -426,12 +426,28 @@ const uint8_t kDaikin160SwingVAuto = 0xF;
union Daikin176Protocol{
uint8_t raw[kDaikin176StateLength]; ///< The state of the IR remote.
struct {
// Byte 0~5
uint8_t pad0[6];
// Byte 0~2
uint8_t :8;
uint8_t :8;
uint8_t :8;
// Byte 3
uint8_t Id1 :1;
uint8_t :7;
// Byte 4
uint8_t :8;
// Byte 5
uint8_t :8;
// Byte 6
uint8_t Sum1 :8;
// Byte 7~11
uint8_t pad1[5];
// Byte 7-9
uint8_t :8;
uint8_t :8;
uint8_t :8;
// Byte 10
uint8_t Id2 :1;
uint8_t :7;
// Byte 11
uint8_t :8;
// Byte 12
uint8_t :4;
uint8_t AltMode :3;
@@ -992,6 +1008,8 @@ class IRDaikin176 {
static uint8_t convertFan(const stdAc::fanspeed_t speed);
void setSwingHorizontal(const uint8_t position);
uint8_t getSwingHorizontal(void) const;
uint8_t getId(void) const;
void setId(const uint8_t num);
static uint8_t convertSwingH(const stdAc::swingh_t position);
static stdAc::fanspeed_t toCommonFanSpeed(const uint8_t speed);
static stdAc::opmode_t toCommonMode(const uint8_t mode);

3
test/IRac_test.cpp
View File

@@ -371,7 +371,8 @@ TEST(TestIRac, Daikin176) {
IRac irac(kGpioUnused);
IRrecv capture(kGpioUnused);
char expected[] =
"Power: On, Mode: 2 (Cool), Temp: 26C, Fan: 1 (Low), Swing(H): 5 (Auto)";
"Power: On, Mode: 2 (Cool), Temp: 26C, Fan: 1 (Low), Swing(H): 5 (Auto), "
"Id: 0";
ac.begin();
irac.daikin176(&ac,

299
test/ir_Daikin_test.cpp
View File

@@ -11,7 +11,7 @@
// Test sending typical data only.
TEST(TestSendDaikin, SendDataOnly) {
IRsendTest irsend(0);
IRsendTest irsend(kGpioUnused);
irsend.begin();
uint8_t daikin_code[kDaikinStateLength] = {
@@ -72,7 +72,7 @@ TEST(TestSendDaikin, SendDataOnly) {
// Test sending with repeats.
TEST(TestSendDaikin, SendWithRepeats) {
IRsendTest irsend(0);
IRsendTest irsend(kGpioUnused);
irsend.begin();
irsend.reset();
@@ -237,7 +237,7 @@ TEST(TestSendDaikin, SendUnexpectedSizes) {
// Tests for IRDaikinESP class.
TEST(TestDaikinClass, Power) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.on();
@@ -254,7 +254,7 @@ TEST(TestDaikinClass, Power) {
}
TEST(TestDaikinClass, Temperature) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setTemp(0);
@@ -289,7 +289,7 @@ TEST(TestDaikinClass, Temperature) {
}
TEST(TestDaikinClass, OperatingMode) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikinAuto);
@@ -318,7 +318,7 @@ TEST(TestDaikinClass, OperatingMode) {
}
TEST(TestDaikinClass, VaneSwing) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setSwingHorizontal(true);
@@ -342,7 +342,7 @@ TEST(TestDaikinClass, VaneSwing) {
}
TEST(TestDaikinClass, QuietMode) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setQuiet(true);
@@ -366,7 +366,7 @@ TEST(TestDaikinClass, QuietMode) {
}
TEST(TestDaikinClass, PowerfulMode) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setPowerful(true);
@@ -387,7 +387,7 @@ TEST(TestDaikinClass, PowerfulMode) {
}
TEST(TestDaikinClass, EconoMode) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setEcono(true);
@@ -411,7 +411,7 @@ TEST(TestDaikinClass, EconoMode) {
}
TEST(TestDaikinClass, FanSpeed) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
// Unexpected value should default to Auto.
@@ -453,7 +453,7 @@ TEST(TestDaikinClass, FanSpeed) {
}
TEST(TestDaikinClass, CurrentTime) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setCurrentTime(0); // 00:00
@@ -467,7 +467,7 @@ TEST(TestDaikinClass, CurrentTime) {
}
TEST(TestDaikinClass, OnOffTimers) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
// Both timers turned off.
@@ -542,7 +542,7 @@ TEST(TestDaikinClass, OnOffTimers) {
}
TEST(TestDaikinClass, WeeklyTimerEnable) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
// The Weekly Timer Enabled flag is stored in the same byte as Econo mode.
@@ -586,7 +586,7 @@ TEST(TestDaikinClass, WeeklyTimerEnable) {
// Test Mold mode.
TEST(TestDaikinClass, MoldSetting) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setMold(false);
@@ -601,7 +601,7 @@ TEST(TestDaikinClass, MoldSetting) {
// Test Comfort mode.
TEST(TestDaikinClass, ComfortSetting) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setComfort(false);
@@ -616,7 +616,7 @@ TEST(TestDaikinClass, ComfortSetting) {
// Test Sensor mode.
TEST(TestDaikinClass, SensorSetting) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.begin();
ac.setSensor(false);
@@ -630,7 +630,7 @@ TEST(TestDaikinClass, SensorSetting) {
}
TEST(TestDaikinClass, SetAndGetRaw) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
uint8_t shortState[kDaikinStateLengthShort] = {
0x11, 0xDA, 0x27, 0x00, 0x42, 0x00, 0x00, 0x54, 0x11,
0xDA, 0x27, 0x00, 0x00, 0x49, 0x1E, 0x00, 0xB0, 0x00,
@@ -688,7 +688,7 @@ TEST(TestDaikinClass, ChecksumValidation) {
// Test human readable output.
TEST(TestDaikinClass, HumanReadable) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
EXPECT_EQ(
"Power: On, Mode: 4 (Heat), Temp: 15C, Fan: 11 (Quiet), "
@@ -723,7 +723,7 @@ TEST(TestDaikinClass, HumanReadable) {
// Test general message construction after tweaking some settings.
TEST(TestDaikinClass, MessageConstuction) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
IRsendTest irsend(4);
ac.begin();
irsend.begin();
@@ -796,9 +796,9 @@ TEST(TestDaikinClass, MessageConstuction) {
// Test decoding a message captured from a real IR remote.
TEST(TestDecodeDaikin, RealExample) {
IRDaikinESP ac(0);
IRsendTest irsend(0);
IRrecv irrecv(0);
IRDaikinESP ac(kGpioUnused);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
irsend.begin();
uint8_t expectedState[kDaikinStateLength] = {
@@ -875,9 +875,9 @@ TEST(TestDecodeDaikin, RealExample) {
// Decoding a message we entirely constructed based solely on a given state.
TEST(TestDecodeDaikin, ShortSyntheticExample) {
IRDaikinESP ac(0);
IRsendTest irsend(0);
IRrecv irrecv(0);
IRDaikinESP ac(kGpioUnused);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
irsend.begin();
uint8_t shortState[kDaikinStateLengthShort] = {
@@ -908,9 +908,9 @@ TEST(TestDecodeDaikin, ShortSyntheticExample) {
// Decoding a message we entirely constructed based solely on a given state.
TEST(TestDecodeDaikin, LongSyntheticExample) {
IRDaikinESP ac(0);
IRsendTest irsend(0);
IRrecv irrecv(0);
IRDaikinESP ac(kGpioUnused);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
irsend.begin();
uint8_t expectedState[kDaikinStateLength] = {
@@ -937,8 +937,8 @@ TEST(TestDecodeDaikin, LongSyntheticExample) {
// Test decoding a message captured from a real IR remote.
TEST(TestDecodeDaikin2, RealExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
irsend.begin();
uint8_t expectedState[kDaikin2StateLength] = {
@@ -1012,9 +1012,9 @@ TEST(TestDecodeDaikin2, RealExample) {
// Decoding a message we entirely constructed based solely on a given state.
TEST(TestDecodeDaikin2, SyntheticExample) {
IRDaikin2 ac(0);
IRsendTest irsend(0);
IRrecv irrecv(0);
IRDaikin2 ac(kGpioUnused);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
irsend.begin();
uint8_t expectedState[kDaikin2StateLength] = {
@@ -1042,7 +1042,7 @@ TEST(TestDecodeDaikin2, SyntheticExample) {
}
TEST(TestDaikin2Class, CurrentTime) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setCurrentTime(0); // 00:00
@@ -1056,7 +1056,7 @@ TEST(TestDaikin2Class, CurrentTime) {
}
TEST(TestDaikin2Class, OnOffTimers) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
// Both timers turned off.
@@ -1097,7 +1097,7 @@ TEST(TestDaikin2Class, OnOffTimers) {
}
TEST(TestDaikin2Class, LightAndBeep) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setLight(kDaikinLightOff);
@@ -1113,7 +1113,7 @@ TEST(TestDaikin2Class, LightAndBeep) {
}
TEST(TestDaikin2Class, FanSpeed) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
// Unexpected value should default to Auto.
@@ -1156,7 +1156,7 @@ TEST(TestDaikin2Class, FanSpeed) {
// Test Mold mode.
TEST(TestDaikin2Class, MoldSetting) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setMold(false);
@@ -1171,7 +1171,7 @@ TEST(TestDaikin2Class, MoldSetting) {
// Test Auto Clean setting.
TEST(TestDaikin2Class, CleanSetting) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setClean(false);
@@ -1186,7 +1186,7 @@ TEST(TestDaikin2Class, CleanSetting) {
TEST(TestDaikin2Class, Temperature) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikinAuto);
@@ -1236,7 +1236,7 @@ TEST(TestDaikin2Class, Temperature) {
// Test Fresh Air settings.
TEST(TestDaikin2Class, FreshAirSettings) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setFreshAir(false);
@@ -1263,7 +1263,7 @@ TEST(TestDaikin2Class, FreshAirSettings) {
// Test Eye mode.
TEST(TestDaikin2Class, EyeSetting) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setEye(false);
@@ -1276,7 +1276,7 @@ TEST(TestDaikin2Class, EyeSetting) {
// Test Econo setting.
TEST(TestDaikin2Class, EconoSetting) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setEcono(false);
@@ -1288,7 +1288,7 @@ TEST(TestDaikin2Class, EconoSetting) {
}
TEST(TestDaikin2Class, SleepTimer) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
// NOTE: On & Sleep timer share the same time location.
@@ -1334,7 +1334,7 @@ TEST(TestDaikin2Class, SleepTimer) {
// Test Vertical Swing.
TEST(TestDaikin2Class, Swing) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
// Vertical
@@ -1372,7 +1372,7 @@ TEST(TestDaikin2Class, Swing) {
}
TEST(TestDaikin2Class, QuietMode) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setQuiet(true);
@@ -1390,7 +1390,7 @@ TEST(TestDaikin2Class, QuietMode) {
}
TEST(TestDaikin2Class, PowerfulMode) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setPowerful(true);
@@ -1408,7 +1408,7 @@ TEST(TestDaikin2Class, PowerfulMode) {
// Test Purify mode.
TEST(TestDaikin2Class, PurifySetting) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setPurify(false);
@@ -1420,7 +1420,7 @@ TEST(TestDaikin2Class, PurifySetting) {
}
TEST(TestDaikin2Class, HumanReadable) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.begin();
ac.setPower(true);
ac.setMode(kDaikinCool);
@@ -1471,7 +1471,7 @@ TEST(TestDaikin2Class, HumanReadable) {
// See if we can construct a known state.
TEST(TestDaikin2Class, KnownConstruction) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
uint8_t expectedState[kDaikin2StateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x01, 0x7A, 0xC3, 0x70, 0x28, 0x0C,
@@ -1556,7 +1556,7 @@ TEST(TestUtils, Housekeeping) {
// https://github.com/crankyoldgit/IRremoteESP8266/issues/582#issuecomment-453863879
TEST(TestDecodeDaikin2, Issue582DeepDecodeExample) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
const uint8_t state[kDaikin2StateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x01, 0x30, 0x42, 0xF0, 0x28, 0x0C,
@@ -1580,7 +1580,7 @@ TEST(TestDecodeDaikin2, Issue582DeepDecodeExample) {
// https://docs.google.com/spreadsheets/d/1f8EGfIbBUo2B-CzUFdrgKQprWakoYNKM80IKZN4KXQE/edit?ts=5c317775#gid=1023395743
TEST(TestDecodeDaikin2, Issue582PowerfulEconoFix) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
const uint8_t PowerfulOn[39] = {
0x11, 0xDA, 0x27, 0x00, 0x01, 0x3A, 0x43, 0xF0, 0x28, 0x0C,
@@ -1648,7 +1648,7 @@ TEST(TestDecodeDaikin2, Issue582PowerfulEconoFix) {
// Tests for IRDaikin216 class.
TEST(TestDaikin216Class, Power) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
ac.on();
@@ -1665,7 +1665,7 @@ TEST(TestDaikin216Class, Power) {
}
TEST(TestDaikin216Class, Temperature) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
ac.setTemp(0);
@@ -1700,7 +1700,7 @@ TEST(TestDaikin216Class, Temperature) {
}
TEST(TestDaikin216Class, OperatingMode) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikinAuto);
@@ -1729,7 +1729,7 @@ TEST(TestDaikin216Class, OperatingMode) {
}
TEST(TestDaikin216Class, VaneSwing) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
ac.setSwingHorizontal(true);
@@ -1753,7 +1753,7 @@ TEST(TestDaikin216Class, VaneSwing) {
}
TEST(TestDaikin216Class, FanSpeed) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
// Unexpected value should default to Auto.
@@ -1795,7 +1795,7 @@ TEST(TestDaikin216Class, FanSpeed) {
}
TEST(TestDaikin216Class, QuietAndPowerful) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
ac.setQuiet(false);
@@ -1828,7 +1828,7 @@ TEST(TestDaikin216Class, QuietAndPowerful) {
}
TEST(TestDaikin216Class, ExampleStates) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
// https://github.com/crankyoldgit/IRremoteESP8266/pull/690#issuecomment-487770194
uint8_t state[kDaikin216StateLength] = {
@@ -1844,7 +1844,7 @@ TEST(TestDaikin216Class, ExampleStates) {
}
TEST(TestDaikin216Class, ReconstructKnownState) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.begin();
// https://github.com/crankyoldgit/IRremoteESP8266/issues/689#issue-438086949
uint8_t expectedState[kDaikin216StateLength] = {
@@ -1869,8 +1869,8 @@ TEST(TestDaikin216Class, ReconstructKnownState) {
// https://github.com/crankyoldgit/IRremoteESP8266/issues/689
TEST(TestDecodeDaikin216, RealExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
// https://github.com/crankyoldgit/IRremoteESP8266/issues/689#issue-438086949
uint16_t rawData[439] = {
3402, 1770, 382, 1340, 382, 480, 382, 478, 382, 480, 380, 1342, 382, 478,
@@ -1920,7 +1920,7 @@ TEST(TestDecodeDaikin216, RealExample) {
ASSERT_EQ(kDaikin216Bits, irsend.capture.bits);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.setRaw(irsend.capture.state);
EXPECT_EQ(
"Power: Off, Mode: 0 (Auto), Temp: 19C, Fan: 10 (Auto), "
@@ -1931,8 +1931,8 @@ TEST(TestDecodeDaikin216, RealExample) {
// https://github.com/crankyoldgit/IRremoteESP8266/issues/689
TEST(TestDecodeDaikin216, SyntheticExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
// https://github.com/crankyoldgit/IRremoteESP8266/issues/689#issue-438086949
uint8_t expectedState[kDaikin216StateLength] = {
// 8 bytes
@@ -1952,7 +1952,7 @@ TEST(TestDecodeDaikin216, SyntheticExample) {
}
TEST(TestDaikinClass, toCommon) {
IRDaikinESP ac(0);
IRDaikinESP ac(kGpioUnused);
ac.setPower(true);
ac.setMode(kDaikinCool);
ac.setTemp(20);
@@ -1986,7 +1986,7 @@ TEST(TestDaikinClass, toCommon) {
}
TEST(TestDaikin2Class, toCommon) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
ac.setPower(true);
ac.setMode(kDaikinCool);
ac.setTemp(20);
@@ -2024,7 +2024,7 @@ TEST(TestDaikin2Class, toCommon) {
}
TEST(TestDaikin216Class, toCommon) {
IRDaikin216 ac(0);
IRDaikin216 ac(kGpioUnused);
ac.setPower(true);
ac.setMode(kDaikinCool);
ac.setTemp(20);
@@ -2057,8 +2057,8 @@ TEST(TestDaikin216Class, toCommon) {
// https://github.com/crankyoldgit/IRremoteESP8266/issues/731
TEST(TestDecodeDaikin160, RealExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
uint16_t rawData[327] = {
5024, 2144, 342, 1786, 344, 706, 342, 706, 344, 706, 342, 1786, 342, 706,
342, 708, 342, 708, 342, 708, 342, 1786, 342, 708, 342, 1786, 342, 1788,
@@ -2100,15 +2100,15 @@ TEST(TestDecodeDaikin160, RealExample) {
ASSERT_EQ(DAIKIN160, irsend.capture.decode_type);
ASSERT_EQ(kDaikin160Bits, irsend.capture.bits);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.setRaw(irsend.capture.state);
EXPECT_EQ("Power: Off, Mode: 3 (Cool), Temp: 25C, Fan: 10 (Auto), "
"Swing(V): 1 (Lowest)", ac.toString());
}
TEST(TestDecodeDaikin160, SyntheticExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
uint8_t expectedState[kDaikin160StateLength] = {
// 7 bytes
@@ -2128,7 +2128,7 @@ TEST(TestDecodeDaikin160, SyntheticExample) {
}
TEST(TestDaikin160Class, toCommon) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.setPower(true);
ac.setMode(kDaikinCool);
ac.setTemp(20);
@@ -2157,7 +2157,7 @@ TEST(TestDaikin160Class, toCommon) {
}
TEST(TestDaikin160Class, FanSpeed) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.begin();
// Unexpected value should default to Auto.
@@ -2199,7 +2199,7 @@ TEST(TestDaikin160Class, FanSpeed) {
}
TEST(TestDaikin160Class, VaneSwing) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.begin();
ac.setSwingVertical(kDaikin160SwingVAuto);
@@ -2220,7 +2220,7 @@ TEST(TestDaikin160Class, VaneSwing) {
}
TEST(TestDaikin160Class, Power) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.begin();
ac.on();
@@ -2237,7 +2237,7 @@ TEST(TestDaikin160Class, Power) {
}
TEST(TestDaikin160Class, Temperature) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.begin();
ac.setTemp(0);
@@ -2272,7 +2272,7 @@ TEST(TestDaikin160Class, Temperature) {
}
TEST(TestDaikin160Class, OperatingMode) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikinAuto);
@@ -2301,7 +2301,7 @@ TEST(TestDaikin160Class, OperatingMode) {
}
TEST(TestDaikin160Class, HumanReadable) {
IRDaikin160 ac(0);
IRDaikin160 ac(kGpioUnused);
EXPECT_EQ(
"Power: Off, Mode: 3 (Cool), Temp: 25C, Fan: 10 (Auto), "
@@ -2319,23 +2319,27 @@ TEST(TestDaikin160Class, HumanReadable) {
}
TEST(TestDaikin176Class, FanControl) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
EXPECT_EQ(
"Power: Off, Mode: 2 (Cool), Temp: 9C, Fan: 1 (Low), Swing(H): 6 (Off)",
"Power: Off, Mode: 2 (Cool), Temp: 9C, Fan: 1 (Low), Swing(H): 6 (Off), "
"Id: 0",
ac.toString());
ac.setFan(kDaikinFanMin);
ac.setPower(true);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 9C, Fan: 1 (Low), Swing(H): 6 (Off)",
"Power: On, Mode: 2 (Cool), Temp: 9C, Fan: 1 (Low), Swing(H): 6 (Off), "
"Id: 0",
ac.toString());
ac.setFan(kDaikinFanMin + 1);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 9C, Fan: 3 (High), Swing(H): 6 (Off)",
"Power: On, Mode: 2 (Cool), Temp: 9C, Fan: 3 (High), Swing(H): 6 (Off), "
"Id: 0",
ac.toString());
ac.setFan(kDaikin176FanMax);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 9C, Fan: 3 (High), Swing(H): 6 (Off)",
"Power: On, Mode: 2 (Cool), Temp: 9C, Fan: 3 (High), Swing(H): 6 (Off), "
"Id: 0",
ac.toString());
// Real state from remote
@@ -2347,7 +2351,7 @@ TEST(TestDaikin176Class, FanControl) {
ac.setRaw(state);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 26C, Fan: 3 (High), "
"Swing(H): 5 (Auto)",
"Swing(H): 5 (Auto), Id: 0",
ac.toString());
}
@@ -2364,25 +2368,28 @@ TEST(TestDaikin176Class, convertFan) {
}
TEST(TestDaikin176Class, SimulateIRacDaikin176) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
ac.setPower(true);
ac.setMode(ac.convertMode(stdAc::opmode_t::kCool));
ac.setTemp(26);
ac.setFan(ac.convertFan(stdAc::fanspeed_t::kMax));
ac.setSwingHorizontal(kDaikin176SwingHOff);
ac.setId(0);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 26C, Fan: 3 (High), Swing(H): 6 (Off)",
"Power: On, Mode: 2 (Cool), Temp: 26C, Fan: 3 (High), Swing(H): 6 (Off), "
"Id: 0",
ac.toString());
ac.setSwingHorizontal(ac.convertSwingH(stdAc::swingh_t::kAuto));
ac.setId(1);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 26C, Fan: 3 (High), "
"Swing(H): 5 (Auto)",
"Swing(H): 5 (Auto), Id: 1",
ac.toString());
}
TEST(TestDaikin176Class, OperatingMode) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikin176Auto);
@@ -2411,7 +2418,7 @@ TEST(TestDaikin176Class, OperatingMode) {
}
TEST(TestDaikin176Class, Temperature) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikin176Auto);
ac.setTemp(0);
@@ -2462,7 +2469,7 @@ TEST(TestDaikin176Class, Temperature) {
}
TEST(TestDaikin176Class, Power) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
ac.begin();
ac.on();
@@ -2479,7 +2486,7 @@ TEST(TestDaikin176Class, Power) {
}
TEST(TestDaikin176Class, VaneSwing) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
ac.begin();
ac.setSwingHorizontal(kDaikin176SwingHAuto);
@@ -2503,7 +2510,7 @@ TEST(TestDaikin176Class, VaneSwing) {
}
TEST(TestDaikin176Class, ReconstructKnownStates) {
IRDaikin176 ac(0);
IRDaikin176 ac(kGpioUnused);
ac.begin();
// Data from:
// https://github.com/crankyoldgit/IRremoteESP8266/pull/826#issuecomment-513531138
@@ -2550,8 +2557,8 @@ TEST(TestDaikin176Class, ReconstructKnownStates) {
// Data from:
// https://docs.google.com/spreadsheets/d/1-YJnHyzy6bId5QmjTEZuw8_wSufESoIl-L_VEF-o8lM/edit?usp=sharing
TEST(TestDecodeDaikin128, RealExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
uint16_t rawData[265] = {
9846, 9794, 9848, 9796, 4638, 2512, 348, 382, 352, 954, 352, 956, 352,
382, 352, 956, 352, 384, 352, 382, 352, 386, 352, 382, 352, 954, 352, 384,
@@ -2601,8 +2608,8 @@ TEST(TestDecodeDaikin128, RealExample) {
// Data from:
// https://docs.google.com/spreadsheets/d/1-YJnHyzy6bId5QmjTEZuw8_wSufESoIl-L_VEF-o8lM/edit?usp=sharing
TEST(TestDecodeDaikin128, SyntheticSelfDecode) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
uint8_t expectedState[kDaikin128StateLength] = {
// 8 bytes
0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
@@ -2620,7 +2627,7 @@ TEST(TestDecodeDaikin128, SyntheticSelfDecode) {
}
TEST(TestDaikin128Class, Checksums) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
uint8_t knownGood[kDaikin128StateLength] = {
0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
@@ -2636,7 +2643,7 @@ TEST(TestDaikin128Class, Checksums) {
}
TEST(TestDaikin128Class, PowerToggle) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setPowerToggle(true);
@@ -2648,7 +2655,7 @@ TEST(TestDaikin128Class, PowerToggle) {
}
TEST(TestDaikin128Class, SwingVertical) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setSwingVertical(true);
@@ -2660,7 +2667,7 @@ TEST(TestDaikin128Class, SwingVertical) {
}
TEST(TestDaikin128Class, Sleep) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setSleep(true);
@@ -2672,7 +2679,7 @@ TEST(TestDaikin128Class, Sleep) {
}
TEST(TestDaikin128Class, Econo) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
// Econo works in some modes
@@ -2691,7 +2698,7 @@ TEST(TestDaikin128Class, Econo) {
}
TEST(TestDaikin128Class, FanSpeed) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikin128Cool);
@@ -2727,7 +2734,7 @@ TEST(TestDaikin128Class, FanSpeed) {
}
TEST(TestDaikin128Class, OperatingMode) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setMode(0);
@@ -2751,7 +2758,7 @@ TEST(TestDaikin128Class, OperatingMode) {
}
TEST(TestDaikin128Class, Quiet) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
// Quiet works in some modes
@@ -2770,7 +2777,7 @@ TEST(TestDaikin128Class, Quiet) {
}
TEST(TestDaikin128Class, Powerful) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
// Powerful works in some modes
@@ -2789,7 +2796,7 @@ TEST(TestDaikin128Class, Powerful) {
}
TEST(TestDaikin128Class, Temperature) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setTemp(0);
@@ -2825,7 +2832,7 @@ TEST(TestDaikin128Class, Temperature) {
// Test human readable output.
TEST(TestDaikin128Class, HumanReadable) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.setPowerToggle(false);
ac.setMode(kDaikin128Auto);
@@ -2866,7 +2873,7 @@ TEST(TestDaikin128Class, HumanReadable) {
}
TEST(TestDaikin128Class, Clock) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setClock(0);
@@ -2880,7 +2887,7 @@ TEST(TestDaikin128Class, Clock) {
}
TEST(TestDaikin128Class, Timers) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
ac.begin();
ac.setOnTimerEnabled(false);
@@ -2913,7 +2920,7 @@ TEST(TestDaikin128Class, Timers) {
}
TEST(TestDaikin128Class, ReconstructKnownState) {
IRDaikin128 ac(0);
IRDaikin128 ac(kGpioUnused);
uint8_t expectedState[kDaikin128StateLength] = {
0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
@@ -2943,8 +2950,8 @@ TEST(TestDaikin128Class, ReconstructKnownState) {
// Data from:
// https://github.com/crankyoldgit/IRremoteESP8266/issues/873#issue-485088080
TEST(TestDecodeDaikin152, RealExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
uint16_t rawData[319] = {
450, 420, 448, 446, 422, 444, 422, 446, 422, 446, 422, 25182, 3492, 1718,
450, 1288, 448, 422, 446, 448, 420, 446, 422, 1290, 448, 422, 446, 446,
@@ -2991,8 +2998,8 @@ TEST(TestDecodeDaikin152, RealExample) {
// https://github.com/crankyoldgit/IRremoteESP8266/issues/873
TEST(TestDecodeDaikin152, SyntheticExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
IRsendTest irsend(kGpioUnused);
IRrecv irrecv(kGpioUnused);
uint8_t expectedState[kDaikin152StateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x00, 0x00, 0x34, 0x00, 0x40, 0x00,
0x00, 0x00, 0x00, 0x20, 0x00, 0xC5, 0x40, 0x00, 0xAB};
@@ -3027,7 +3034,7 @@ TEST(TestDecodeDaikin152, SyntheticExample) {
}
TEST(TestDaikin2ClassNew, Issue908) {
IRDaikin2 ac(0);
IRDaikin2 ac(kGpioUnused);
// https://docs.google.com/spreadsheets/d/1f8EGfIbBUo2B-CzUFdrgKQprWakoYNKM80IKZN4KXQE/edit#gid=236366525&range=I8
uint8_t fanMedium[kDaikin2StateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x01, 0x4A, 0x42, 0xB0, 0x28, 0x0C, 0x80, 0x04,
@@ -3084,7 +3091,7 @@ TEST(TestDaikin2ClassNew, Issue908) {
// Tests for IRDaikin152 class.
TEST(TestDaikin152Class, Power) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.on();
@@ -3101,7 +3108,7 @@ TEST(TestDaikin152Class, Power) {
}
TEST(TestDaikin152Class, Temperature) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikinHeat); // Heat has the widest temp range.
ac.setTemp(0);
@@ -3140,7 +3147,7 @@ TEST(TestDaikin152Class, Temperature) {
}
TEST(TestDaikin152Class, OperatingMode) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikinAuto);
@@ -3173,7 +3180,7 @@ TEST(TestDaikin152Class, OperatingMode) {
}
TEST(TestDaikin152Class, Swing) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.setSwingV(false);
@@ -3187,7 +3194,7 @@ TEST(TestDaikin152Class, Swing) {
}
TEST(TestDaikin152Class, QuietMode) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.setQuiet(true);
@@ -3211,7 +3218,7 @@ TEST(TestDaikin152Class, QuietMode) {
}
TEST(TestDaikin152Class, PowerfulMode) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.setPowerful(true);
@@ -3232,7 +3239,7 @@ TEST(TestDaikin152Class, PowerfulMode) {
}
TEST(TestDaikin152Class, EconoMode) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
ac.setEcono(true);
@@ -3256,7 +3263,7 @@ TEST(TestDaikin152Class, EconoMode) {
}
TEST(TestDaikin152Class, FanSpeed) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
// Unexpected value should default to Auto.
@@ -3298,7 +3305,7 @@ TEST(TestDaikin152Class, FanSpeed) {
}
TEST(TestDaikin152Class, Comfort) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.begin();
// Comfort mode should change these settings.
@@ -3320,7 +3327,7 @@ TEST(TestDaikin152Class, Comfort) {
}
TEST(TestDaikin152Class, toCommon) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.setPower(true);
ac.setMode(kDaikinCool);
ac.setTemp(20);
@@ -3364,7 +3371,7 @@ TEST(TestDaikin152Class, convertFan) {
}
TEST(TestDaikin152Class, BuildKnownState) {
IRDaikin152 ac(0);
IRDaikin152 ac(kGpioUnused);
ac.setPower(true);
ac.setMode(kDaikinCool);
ac.setTemp(20);
@@ -3488,7 +3495,7 @@ TEST(TestDaikin64Class, ChecksumAndSetGetRaw) {
}
TEST(TestDaikin64Class, Temperature) {
IRDaikin64 ac(0);
IRDaikin64 ac(kGpioUnused);
ac.begin();
ac.setTemp(0);
EXPECT_EQ(kDaikin64MinTemp, ac.getTemp());
@@ -3527,7 +3534,7 @@ TEST(TestDaikin64Class, Temperature) {
}
TEST(TestDaikin64Class, OperatingMode) {
IRDaikin64 ac(0);
IRDaikin64 ac(kGpioUnused);
ac.begin();
ac.setMode(kDaikin64Cool);
@@ -3556,7 +3563,7 @@ TEST(TestDaikin64Class, OperatingMode) {
}
TEST(TestDaikin64Class, PowerToggle) {
IRDaikin64 ac(0);
IRDaikin64 ac(kGpioUnused);
ac.begin();
ac.setPowerToggle(true);
@@ -3842,3 +3849,33 @@ TEST(TestDaikin2Class, Humidity) {
"Eye Auto: Off, Quiet: Off, Powerful: Off, Purify: On, Econo: Off, "
"Humid: 55%", ac.toString());
}
TEST(TestDaikin176Class, UnitId) {
// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1543
IRDaikin176 ac(kGpioUnused);
EXPECT_EQ(0, ac.getId());
ac.setId(1);
EXPECT_EQ(1, ac.getId());
ac.setId(0);
EXPECT_EQ(0, ac.getId());
// Real example(s)
const uint8_t unita[22] = {
0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E,
0x11, 0xDA, 0x17, 0x18, 0x00, 0x73, 0x00,
0x21, 0x00, 0x00, 0x1E, 0x36, 0x00, 0x20, 0x22};
const uint8_t unitb[22] = {
0x11, 0xDA, 0x17, 0x19, 0x04, 0x00, 0x1F,
0x11, 0xDA, 0x17, 0x19, 0x00, 0x73, 0x00,
0x21, 0x00, 0x00, 0x1E, 0x36, 0x00, 0x20, 0x23};
ac.setRaw(unitb);
ASSERT_EQ(1, ac.getId());
EXPECT_STATE_EQ(unitb, ac.getRaw(), kDaikin176Bits);
EXPECT_EQ(
"Power: On, Mode: 2 (Cool), Temp: 24C, Fan: 3 (High), Swing(H): 6 (Off), "
"Id: 1", ac.toString());
// Check if we can successfully convert to a known-good Unit A message.
ac.setId(0);
ASSERT_EQ(0, ac.getId());
EXPECT_STATE_EQ(unita, ac.getRaw(), kDaikin176Bits);
}