Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HAIER_AC176/HAIER_AC_YRW02] Implement horizontal swing feature #1641

Merged
merged 15 commits into from
Oct 20, 2021
+354 −196
Merged

[HAIER_AC176/HAIER_AC_YRW02] Implement horizontal swing feature #1641

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f1a2894
Rename Swing to SwingV for vertical swing
PtilopsisLeucotis Oct 16, 2021
4fda38c
Add horisontal swing feature
PtilopsisLeucotis Oct 17, 2021
ce06187
Fix tests
PtilopsisLeucotis Oct 17, 2021
7c3315b
Add some horisontal swing tests
PtilopsisLeucotis Oct 17, 2021
c964172
Fix typo
PtilopsisLeucotis Oct 17, 2021
6ee9669
Satisfy cpplint
PtilopsisLeucotis Oct 17, 2021
821c974
Rename back kHaierAcCmdSwingV to kHaierAcCmdSwing
PtilopsisLeucotis Oct 18, 2021
28f86f0
Cosmetic line up returns
PtilopsisLeucotis Oct 18, 2021
037db98
Return back `getSwing()`, `setSwing()` functions
PtilopsisLeucotis Oct 18, 2021
cb8259f
Revert changed legacy defines
PtilopsisLeucotis Oct 18, 2021
a6f2df0
Rework SwingH to string conversion
PtilopsisLeucotis Oct 18, 2021
7e30ff9
Satisfy cpplint
PtilopsisLeucotis Oct 18, 2021
9f61de8
Cosmetic fix `IRHaierAC176::setSwingV()`
PtilopsisLeucotis Oct 19, 2021
e4e7a49
Fix gramamatical error in comments
PtilopsisLeucotis Oct 19, 2021
b1e4574
Increase heap size for `IRHaierAC::toString()`
PtilopsisLeucotis Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests
@PtilopsisLeucotis
PtilopsisLeucotis committed Oct 17, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit ce061871267330a97ac774d5fbeb85cb6d01f979
12 changes: 8 additions & 4 deletions test/IRac_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -789,15 +789,17 @@ TEST(TestIRac, Haier176) {
IRrecv capture(kGpioUnused);
const char expected[] =
"Power: On, Button: 5 (Power), Mode: 1 (Cool), Temp: 23C, "
"Fan: 2 (Medium), Turbo: On, Quiet: Off, Swing(V): 1 (Highest), Sleep: On, "
"Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off";
"Fan: 2 (Medium), Turbo: On, Quiet: Off, Swing(V): 1 (Highest), "
"Swing(H): 0 (Off), Sleep: On, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off";
ac.begin();
irac.haier176(&ac,
true, // Power
stdAc::opmode_t::kCool, // Mode
23, // Celsius
stdAc::fanspeed_t::kMedium, // Fan speed
stdAc::swingv_t::kHigh, // Vertical swing
stdAc::swingh_t::kOff, // Horisontal swing
true, // Turbo
false, // Quiet
true, // Filter
@@ -818,8 +820,9 @@ TEST(TestIRac, HaierYrwo2) {
IRrecv capture(kGpioUnused);
char expected[] =
"Power: On, Button: 5 (Power), Mode: 1 (Cool), Temp: 23C, "
"Fan: 2 (Medium), Turbo: Off, Quiet: On, Swing(V): 1 (Highest), Sleep: On, "
"Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off";
"Fan: 2 (Medium), Turbo: Off, Quiet: On, Swing(V): 1 (Highest), "
"Swing(H): 7 (Auto), Sleep: On, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off";

ac.begin();
irac.haierYrwo2(&ac,
@@ -828,6 +831,7 @@ TEST(TestIRac, HaierYrwo2) {
23, // Celsius
stdAc::fanspeed_t::kMedium, // Fan speed
stdAc::swingv_t::kHigh, // Vertical swing
stdAc::swingh_t::kAuto, // Vertical swing
false, // Turbo
true, // Quiet
true, // Filter
86 changes: 51 additions & 35 deletions test/ir_Haier_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -690,17 +690,19 @@ TEST(TestHaierACYRW02Class, MessageConstuction) {
IRHaierACYRW02 ac(kGpioUnused);

EXPECT_EQ(
"Power: On, Button: 5 (Power), Mode: 0 (Auto), Temp: 25C,"
" Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), Sleep: Off,"
" Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Power: On, Button: 5 (Power), Mode: 0 (Auto), Temp: 25C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), "
"Swing(H): 0 (Off), Sleep: Off, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
ac.setMode(kHaierAcYrw02Cool);
ac.setTemp(21);
ac.setFan(kHaierAcYrw02FanHigh);
EXPECT_EQ(
"Power: On, Button: 4 (Fan), Mode: 1 (Cool), Temp: 21C,"
" Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), Sleep: Off,"
" Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Power: On, Button: 4 (Fan), Mode: 1 (Cool), Temp: 21C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), "
"Swing(H): 0 (Off), Sleep: Off, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());

ac.setSwingV(kHaierAcYrw02SwingVMiddle);
@@ -710,7 +712,7 @@ TEST(TestHaierACYRW02Class, MessageConstuction) {
EXPECT_EQ(
"Power: On, Button: 8 (Turbo), Mode: 1 (Cool), Temp: 21C, "
"Fan: 1 (High), Turbo: On, Quiet: Off, Swing(V): 2 (Middle), "
"Sleep: On, Health: Off, "
"Swing(H): 0 (Off), Sleep: On, Health: Off, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
}
@@ -725,8 +727,9 @@ TEST(TestHaierACYRW02Class, RealStates) {
ac.setRaw(expectedState1);
EXPECT_EQ(
"Power: On, Button: 7 (Health), Mode: 4 (Heat), Temp: 30C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 1 (Highest), Sleep: Off, "
"Health: Off, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 1 (Highest), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());

uint8_t expectedState2[kHaierACYRW02StateLength] = {
@@ -735,8 +738,9 @@ TEST(TestHaierACYRW02Class, RealStates) {
ac.setRaw(expectedState2);
EXPECT_EQ(
"Power: Off, Button: 5 (Power), Mode: 4 (Heat), Temp: 30C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), Sleep: Off, "
"Health: Off, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());

uint8_t expectedState3[kHaierACYRW02StateLength] = {
@@ -745,8 +749,9 @@ TEST(TestHaierACYRW02Class, RealStates) {
ac.setRaw(expectedState3);
EXPECT_EQ(
"Power: On, Button: 1 (Temp Down), Mode: 1 (Cool), Temp: 16C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());

// cool 25, health, fan auto, vertical swing auto, sleep on
@@ -756,8 +761,9 @@ TEST(TestHaierACYRW02Class, RealStates) {
ac.setRaw(expectedState4);
EXPECT_EQ(
"Power: On, Button: 11 (Sleep), Mode: 1 (Cool), Temp: 25C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 12 (Auto), Sleep: On, "
"Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 12 (Auto), "
"Swing(H): 0 (Off), Sleep: On, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());

// cool 25, health, fan 3, vertical swing auto, sleep on
@@ -767,8 +773,9 @@ TEST(TestHaierACYRW02Class, RealStates) {
ac.setRaw(expectedState5);
EXPECT_EQ(
"Power: On, Button: 4 (Fan), Mode: 1 (Cool), Temp: 25C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 12 (Auto), Sleep: On, "
"Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 12 (Auto), "
"Swing(H): 0 (Off), Sleep: On, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
}

@@ -998,8 +1005,9 @@ TEST(TestDecodeHaierAC_YRW02, RealExample) {
ac.setRaw(irsend.capture.state);
EXPECT_EQ(
"Power: On, Button: 5 (Power), Mode: 1 (Cool), Temp: 17C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: On, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
}

@@ -1221,8 +1229,9 @@ TEST(TestDecodeHaierAC176, SyntheticDecode) {
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
EXPECT_EQ(
"Power: On, Button: 5 (Power), Mode: 1 (Cool), Temp: 24C, Fan: 5 (Auto), "
"Turbo: Off, Quiet: Off, Swing(V): 6 (UNKNOWN), Sleep: Off, Health: Off, "
"Power: On, Button: 5 (Power), Mode: 1 (Cool), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 6 (UNKNOWN), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
IRAcUtils::resultAcToString(&irsend.capture));
stdAc::state_t result, prev;
@@ -1262,8 +1271,9 @@ TEST(TestHaierAC176Class, BuildKnownState) {
ac.setFan(kHaierAcYrw02FanHigh);
EXPECT_TRUE(ac.validChecksum(ac.getRaw()));
EXPECT_EQ(
"Power: On, Button: 4 (Fan), Mode: 4 (Heat), Temp: 24C, Fan: 1 (High), "
"Turbo: Off, Quiet: Off, Swing(V): 0 (Off), Sleep: Off, Health: On, "
"Power: On, Button: 4 (Fan), Mode: 4 (Heat), Temp: 24C, "
"Fan: 1 (High), Turbo: Off, Quiet: Off, Swing(V): 0 (Off), "
"Swing(H): 0 (Off), Sleep: Off, Health: On, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
/* Disabled pending:
@@ -1354,42 +1364,48 @@ TEST(TestHaierAC176Class, Timers) {
EXPECT_EQ(kHaierAcYrw02OnTimer, ac.getTimerMode());
EXPECT_EQ(
"Power: Off, Button: 0 (Temp Up), Mode: 0 (Auto), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: Off, Timer Mode: 2 (On), On Timer: 00:30, Off Timer: Off",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 2 (On), On Timer: 00:30, Off Timer: Off",
ac.toString());
ac.setRaw(timeroff);
EXPECT_EQ(kHaierAcYrw02NoTimers, ac.getTimerMode());
EXPECT_EQ(
"Power: On, Button: 0 (Temp Up), Mode: 0 (Auto), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: Off, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
ac.setRaw(timeroffthenon);
EXPECT_EQ(
"Power: On, Button: 0 (Temp Up), Mode: 0 (Auto), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: Off, Timer Mode: 5 (Off-On), On Timer: 08:00, Off Timer: 00:30",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 5 (Off-On), On Timer: 08:00, Off Timer: 00:30",
ac.toString());
ac.setTimerMode(kHaierAcYrw02OnThenOffTimer);
EXPECT_EQ(
"Power: On, Button: 0 (Temp Up), Mode: 0 (Auto), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: Off, Timer Mode: 4 (On-Off), On Timer: 08:00, Off Timer: 00:30",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 4 (On-Off), On Timer: 08:00, Off Timer: 00:30",
ac.toString());
ac.setTimerMode(kHaierAcYrw02OffTimer);
EXPECT_EQ(0, ac.getOnTimer());
EXPECT_EQ(30, ac.getOffTimer());
EXPECT_EQ(
"Power: On, Button: 0 (Temp Up), Mode: 0 (Auto), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: Off, Timer Mode: 1 (Off), On Timer: Off, Off Timer: 00:30",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 1 (Off), On Timer: Off, Off Timer: 00:30",
ac.toString());
ac.setTimerMode(kHaierAcYrw02NoTimers);
EXPECT_EQ(0, ac.getOnTimer());
EXPECT_EQ(0, ac.getOffTimer());
EXPECT_EQ(
"Power: On, Button: 0 (Temp Up), Mode: 0 (Auto), Temp: 24C, "
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), Sleep: Off, "
"Health: Off, Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
"Fan: 5 (Auto), Turbo: Off, Quiet: Off, Swing(V): 2 (Middle), "
"Swing(H): 0 (Off), Sleep: Off, Health: Off, "
"Timer Mode: 0 (N/A), On Timer: Off, Off Timer: Off",
ac.toString());
}