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

Panasonic AC - Fix Low and High fan speed #1515

Merged
merged 7 commits into from
Jul 4, 2021
Merged

Panasonic AC - Fix Low and High fan speed #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a628b9
Update ir_Panasonic.cpp
ajaypala Jul 4, 2021
a5533e7
Update ir_Panasonic.h
ajaypala Jul 4, 2021
c38179a
Update ir_Panasonic_test.cpp
ajaypala Jul 4, 2021
69e248e
More fan speed adjustments.
crankyoldgit Jul 4, 2021
68817da
Update ir_Panasonic.cpp
ajaypala Jul 4, 2021
c9bae10
Fix panasonic output in IRac_test
crankyoldgit Jul 4, 2021
9394dfb
Adjust tests for fan High -> Maximum
crankyoldgit Jul 4, 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
20 changes: 11 additions & 9 deletions src/ir_Panasonic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,9 @@ void IRPanasonicAc::setSwingHorizontal(const uint8_t desired_direction) {
void IRPanasonicAc::setFan(const uint8_t speed) {
switch (speed) {
case kPanasonicAcFanMin:
case kPanasonicAcFanLow:
case kPanasonicAcFanMed:
case kPanasonicAcFanHigh:
case kPanasonicAcFanMax:
case kPanasonicAcFanAuto:
setBits(&remote_state[16], kHighNibble, kNibbleSize,
Expand Down Expand Up @@ -668,9 +670,9 @@ uint8_t IRPanasonicAc::convertMode(const stdAc::opmode_t mode) {
uint8_t IRPanasonicAc::convertFan(const stdAc::fanspeed_t speed) {
switch (speed) {
case stdAc::fanspeed_t::kMin: return kPanasonicAcFanMin;
case stdAc::fanspeed_t::kLow: return kPanasonicAcFanMin + 1;
case stdAc::fanspeed_t::kMedium: return kPanasonicAcFanMin + 2;
case stdAc::fanspeed_t::kHigh: return kPanasonicAcFanMin + 3;
case stdAc::fanspeed_t::kLow: return kPanasonicAcFanLow;
case stdAc::fanspeed_t::kMedium: return kPanasonicAcFanMed;
case stdAc::fanspeed_t::kHigh: return kPanasonicAcFanHigh;
case stdAc::fanspeed_t::kMax: return kPanasonicAcFanMax;
default: return kPanasonicAcFanAuto;
}
Expand Down Expand Up @@ -723,9 +725,9 @@ stdAc::opmode_t IRPanasonicAc::toCommonMode(const uint8_t mode) {
stdAc::fanspeed_t IRPanasonicAc::toCommonFanSpeed(const uint8_t spd) {
switch (spd) {
case kPanasonicAcFanMax: return stdAc::fanspeed_t::kMax;
case kPanasonicAcFanMin + 3: return stdAc::fanspeed_t::kHigh;
case kPanasonicAcFanMin + 2: return stdAc::fanspeed_t::kMedium;
case kPanasonicAcFanMin + 1: return stdAc::fanspeed_t::kLow;
case kPanasonicAcFanHigh: return stdAc::fanspeed_t::kHigh;
case kPanasonicAcFanMed: return stdAc::fanspeed_t::kMedium;
case kPanasonicAcFanLow: return stdAc::fanspeed_t::kLow;
case kPanasonicAcFanMin: return stdAc::fanspeed_t::kMin;
default: return stdAc::fanspeed_t::kAuto;
}
Expand Down Expand Up @@ -791,9 +793,9 @@ String IRPanasonicAc::toString(void) {
result += addModeToString(getMode(), kPanasonicAcAuto, kPanasonicAcCool,
kPanasonicAcHeat, kPanasonicAcDry, kPanasonicAcFan);
result += addTempToString(getTemp());
result += addFanToString(getFan(), kPanasonicAcFanMax, kPanasonicAcFanMin,
kPanasonicAcFanAuto, kPanasonicAcFanAuto,
kPanasonicAcFanMed);
result += addFanToString(getFan(), kPanasonicAcFanHigh, kPanasonicAcFanLow,
kPanasonicAcFanAuto, kPanasonicAcFanMin,
kPanasonicAcFanMed, kPanasonicAcFanMax);
result += addSwingVToString(getSwingVertical(), kPanasonicAcSwingVAuto,
kPanasonicAcSwingVHighest,
kPanasonicAcSwingVHigh,
Expand Down
2 changes: 2 additions & 0 deletions src/ir_Panasonic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ const uint8_t kPanasonicAcCool = 3; // 0b011
const uint8_t kPanasonicAcHeat = 4; // 0b010
const uint8_t kPanasonicAcFan = 6; // 0b110
const uint8_t kPanasonicAcFanMin = 0;
const uint8_t kPanasonicAcFanLow = 1;
const uint8_t kPanasonicAcFanMed = 2;
const uint8_t kPanasonicAcFanHigh = 3;
const uint8_t kPanasonicAcFanMax = 4;
const uint8_t kPanasonicAcFanAuto = 7;
const uint8_t kPanasonicAcFanDelta = 3;
Expand Down
2 changes: 1 addition & 1 deletion test/IRac_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ TEST(TestIRac, Panasonic) {
ASSERT_TRUE(IRAcUtils::decodeToState(&ac._irsend.capture, &r, &p));

char expected_dke[] =
"Model: 3 (DKE), Power: On, Mode: 3 (Cool), Temp: 18C, Fan: 4 (High), "
"Model: 3 (DKE), Power: On, Mode: 3 (Cool), Temp: 18C, Fan: 4 (Maximum), "
"Swing(V): 2 (High), Swing(H): 6 (Middle), "
"Quiet: Off, Powerful: On, Ion: On, "
"Clock: 19:17, On Timer: Off, Off Timer: Off";
Expand Down
14 changes: 7 additions & 7 deletions test/ir_Panasonic_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,16 +665,16 @@ TEST(TestIRPanasonicAcClass, SetAndGetFan) {
EXPECT_EQ(kPanasonicAcFanMin, ac.getFan());
ac.setFan(kPanasonicAcFanMin - 1);
EXPECT_EQ(kPanasonicAcFanAuto, ac.getFan());
ac.setFan(kPanasonicAcFanLow);
EXPECT_EQ(kPanasonicAcFanLow, ac.getFan());
ac.setFan(kPanasonicAcFanMed);
EXPECT_EQ(kPanasonicAcFanMed, ac.getFan());
ac.setFan(kPanasonicAcFanMin + 1);
EXPECT_EQ(kPanasonicAcFanAuto, ac.getFan());
ac.setFan(kPanasonicAcFanHigh);
EXPECT_EQ(kPanasonicAcFanHigh, ac.getFan());
ac.setFan(kPanasonicAcFanMax);
EXPECT_EQ(kPanasonicAcFanMax, ac.getFan());
ac.setFan(kPanasonicAcFanMax + 1);
EXPECT_EQ(kPanasonicAcFanAuto, ac.getFan());
ac.setFan(kPanasonicAcFanMax - 1);
EXPECT_EQ(kPanasonicAcFanAuto, ac.getFan());
}

TEST(TestIRPanasonicAcClass, SetAndGetSwings) {
Expand Down Expand Up @@ -788,22 +788,22 @@ TEST(TestIRPanasonicAcClass, HumanReadable) {
ac.setPowerful(true);
EXPECT_EQ(
"Model: 4 (JKE), Power: On, Mode: 4 (Heat), Temp: 30C, "
"Fan: 4 (High), Swing(V): 15 (Auto), Quiet: Off, "
"Fan: 4 (Maximum), Swing(V): 15 (Auto), Quiet: Off, "
"Powerful: On, Clock: 00:00, On Timer: Off, Off Timer: Off",
ac.toString());
ac.setQuiet(true);
ac.setModel(kPanasonicLke);
EXPECT_EQ(
"Model: 1 (LKE), Power: Off, Mode: 4 (Heat), Temp: 30C, "
"Fan: 4 (High), Swing(V): 15 (Auto), "
"Fan: 4 (Maximum), Swing(V): 15 (Auto), "
"Swing(H): 6 (Middle), Quiet: On, Powerful: Off, "
"Clock: 00:00, On Timer: 00:00, Off Timer: Off",
ac.toString());
ac.setModel(kPanasonicDke);
ac.setSwingHorizontal(kPanasonicAcSwingHRight);
EXPECT_EQ(
"Model: 3 (DKE), Power: Off, Mode: 4 (Heat), Temp: 30C, "
"Fan: 4 (High), Swing(V): 15 (Auto), "
"Fan: 4 (Maximum), Swing(V): 15 (Auto), "
"Swing(H): 11 (Right), Quiet: On, Powerful: Off, Ion: Off, "
"Clock: 00:00, On Timer: Off, Off Timer: Off",
ac.toString());
Expand Down