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
Merged

[HAIER_AC176/HAIER_AC_YRW02] Implement horizontal swing feature #1641

Show file tree
Hide file tree
Changes from all commits
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
26 changes: 15 additions & 11 deletions src/IRac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ void IRac::haier(IRHaierAC *ac,
ac->setMode(ac->convertMode(mode));
ac->setTemp(degrees);
ac->setFan(ac->convertFan(fan));
ac->setSwing(ac->convertSwingV(swingv));
ac->setSwingV(ac->convertSwingV(swingv));
// No Horizontal Swing setting available.
// No Quiet setting available.
// No Turbo setting available.
Expand All @@ -1112,21 +1112,23 @@ void IRac::haier(IRHaierAC *ac,
/// @param[in] degrees The temperature setting in degrees.
/// @param[in] fan The speed setting for the fan.
/// @param[in] swingv The vertical swing setting.
/// @param[in] swingh The horizontal swing setting.
/// @param[in] turbo Run the device in turbo/powerful mode.
/// @param[in] quiet Run the device in quiet mode.
/// @param[in] filter Turn on the (ion/pollen/etc) filter mode.
/// @param[in] sleep Nr. of minutes for sleep mode. -1 is Off, >= 0 is on.
void IRac::haier176(IRHaierAC176 *ac,
const bool on, const stdAc::opmode_t mode,
const float degrees, const stdAc::fanspeed_t fan,
const stdAc::swingv_t swingv, const bool turbo,
const bool quiet, const bool filter, const int16_t sleep) {
const stdAc::swingv_t swingv, const stdAc::swingh_t swingh,
const bool turbo, const bool quiet, const bool filter,
const int16_t sleep) {
ac->begin();
ac->setMode(ac->convertMode(mode));
ac->setTemp(degrees);
ac->setFan(ac->convertFan(fan));
ac->setSwing(ac->convertSwingV(swingv));
// No Horizontal Swing setting available.
ac->setSwingV(ac->convertSwingV(swingv));
ac->setSwingH(ac->convertSwingH(swingh));
ac->setQuiet(quiet);
ac->setTurbo(turbo);
// No Light setting available.
Expand All @@ -1147,22 +1149,24 @@ void IRac::haier176(IRHaierAC176 *ac,
/// @param[in] degrees The temperature setting in degrees.
/// @param[in] fan The speed setting for the fan.
/// @param[in] swingv The vertical swing setting.
/// @param[in] swingh The horizontal swing setting.
/// @param[in] turbo Run the device in turbo/powerful mode.
/// @param[in] quiet Run the device in quiet mode.
/// @param[in] filter Turn on the (ion/pollen/etc) filter mode.
/// @param[in] sleep Nr. of minutes for sleep mode. -1 is Off, >= 0 is on.
void IRac::haierYrwo2(IRHaierACYRW02 *ac,
const bool on, const stdAc::opmode_t mode,
const float degrees, const stdAc::fanspeed_t fan,
const stdAc::swingv_t swingv, const bool turbo,
const bool quiet, const bool filter,
const stdAc::swingv_t swingv,
const stdAc::swingh_t swingh,
const bool turbo, const bool quiet, const bool filter,
const int16_t sleep) {
ac->begin();
ac->setMode(ac->convertMode(mode));
ac->setTemp(degrees);
ac->setFan(ac->convertFan(fan));
ac->setSwing(ac->convertSwingV(swingv));
// No Horizontal Swing setting available.
ac->setSwingV(ac->convertSwingV(swingv));
ac->setSwingH(ac->convertSwingH(swingh));
ac->setQuiet(quiet);
ac->setTurbo(turbo);
// No Light setting available.
Expand Down Expand Up @@ -2751,7 +2755,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
{
IRHaierAC176 ac(_pin, _inverted, _modulation);
haier176(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
send.turbo, send.filter, send.sleep);
send.swingh, send.turbo, send.filter, send.sleep);
break;
}
#endif // SEND_HAIER_AC176
Expand All @@ -2760,7 +2764,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
{
IRHaierACYRW02 ac(_pin, _inverted, _modulation);
haierYrwo2(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
send.turbo, send.filter, send.sleep);
send.swingh, send.turbo, send.filter, send.sleep);
break;
}
#endif // SEND_HAIER_AC_YRW02
Expand Down
4 changes: 2 additions & 2 deletions src/IRac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,15 @@ void electra(IRElectraAc *ac,
void haier176(IRHaierAC176 *ac,
const bool on, const stdAc::opmode_t mode,
const float degrees, const stdAc::fanspeed_t fan,
const stdAc::swingv_t swingv,
const stdAc::swingv_t swingv, const stdAc::swingh_t swingh,
const bool turbo, const bool quiet, const bool filter,
const int16_t sleep = -1);
#endif // SEND_HAIER_AC176
#if SEND_HAIER_AC_YRW02
void haierYrwo2(IRHaierACYRW02 *ac,
const bool on, const stdAc::opmode_t mode,
const float degrees, const stdAc::fanspeed_t fan,
const stdAc::swingv_t swingv,
const stdAc::swingv_t swingv, const stdAc::swingh_t swingh,
const bool turbo, const bool quiet, const bool filter,
const int16_t sleep = -1);
#endif // SEND_HAIER_AC_YRW02
Expand Down
Loading