lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repeat actions cleanup & fix

Browse Source
This commit is contained in:
Blaz Kristan 2022-02-07 11:24:57 +01:00
parent e35ad7551b
commit 5988c2ac78
1 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
wled00/ir.cpp
View File

@ -250,53 +250,32 @@ void decodeIR(uint32_t code)
colorUpdated(CALL_MODE_BUTTON); //for notifier, IR is considered a button input colorUpdated(CALL_MODE_BUTTON); //for notifier, IR is considered a button input
} }
void applyRepeatActions(){ void applyRepeatActions()
{
if (lastRepeatableAction == ACTION_BRIGHT_UP) if (irEnabled == 8) {
{ decodeIRJson(lastValidCode);
incBrightness(); colorUpdated(CALL_MODE_BUTTON); return;
} } else switch (lastRepeatableAction) {
else if (lastRepeatableAction == ACTION_BRIGHT_DOWN ) case ACTION_BRIGHT_UP : incBrightness(); colorUpdated(CALL_MODE_BUTTON); return;
{ case ACTION_BRIGHT_DOWN : decBrightness(); colorUpdated(CALL_MODE_BUTTON); return;
decBrightness(); colorUpdated(CALL_MODE_BUTTON); case ACTION_SPEED_UP : changeEffectSpeed(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON); return;
} case ACTION_SPEED_DOWN : changeEffectSpeed(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON); return;
case ACTION_INTENSITY_UP : changeEffectIntensity(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON); return;
case ACTION_INTENSITY_DOWN : changeEffectIntensity(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON); return;
default: break;
}
if (lastRepeatableAction == ACTION_SPEED_UP) if (lastValidCode == IR40_WPLUS) {
{ relativeChangeWhite(10);
changeEffectSpeed(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON); colorUpdated(CALL_MODE_BUTTON);
} } else if (lastValidCode == IR40_WMINUS) {
else if (lastRepeatableAction == ACTION_SPEED_DOWN ) relativeChangeWhite(-10, 5);
{ colorUpdated(CALL_MODE_BUTTON);
changeEffectSpeed(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON); } else if ((lastValidCode == IR24_ON || lastValidCode == IR40_ON) && irTimesRepeated > 7 ) {
} nightlightActive = true;
nightlightStartTime = millis();
if (lastRepeatableAction == ACTION_INTENSITY_UP) colorUpdated(CALL_MODE_BUTTON);
{ }
changeEffectIntensity(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON);
}
else if (lastRepeatableAction == ACTION_INTENSITY_DOWN )
{
changeEffectIntensity(lastRepeatableValue); colorUpdated(CALL_MODE_BUTTON);
}
if (lastValidCode == IR40_WPLUS)
{
relativeChangeWhite(10); colorUpdated(CALL_MODE_BUTTON);
}
else if (lastValidCode == IR40_WMINUS)
{
relativeChangeWhite(-10, 5); colorUpdated(CALL_MODE_BUTTON);
}
else if ((lastValidCode == IR24_ON || lastValidCode == IR40_ON) && irTimesRepeated > 7 )
{
nightlightActive = true;
nightlightStartTime = millis();
colorUpdated(CALL_MODE_BUTTON);
}
else if (irEnabled == 8)
{
decodeIRJson(lastValidCode);
}
} }
void decodeIR24(uint32_t code) void decodeIR24(uint32_t code)