mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extend dimmer stepping so the step size can be specified in the command. 

this allows things like "DIMMER +20" to increase the dimmer value by 20,
and "DIMMER -40" to lower it by 40. 'DIMMER +' and 'DIMMER +' keep their
current behaviour.

this is useful if you're using something like a zigbee remote that
generate a single message with how much of a step up or down to perform
as part of the payload rather than multiple messages.
This commit is contained in:
David Gwynne 2022-04-15 14:51:30 +10:00
parent dafc5d6f45
commit 03748bd3c0
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tasmota/xdrv_04_light.ino
View File

@ -2902,6 +2902,44 @@ void LightDimmerOffset(uint32_t index, int32_t offset) {
CmndDimmer();
}
static int DimmerStep(int dimmer)
{
int step;
int plus = 1;
int payload;
if (0 == XdrvMailbox.data_len) {
return -1;
}
switch (XdrvMailbox.data[0]) {
case '-':
plus = 0;
case '+':
break;
default:
return -1;
}
if (1 == XdrvMailbox.data_len) {
step = Settings->dimmer_step;
} else {
char *ep;
step = strtoul(XdrvMailbox.data + 1, &ep, 10);
if ('\0' != *ep || 1 > step) {
return -1;
}
}
if (plus) {
payload = min(100, dimmer + step);
} else {
payload = max(1, dimmer - step);
}
return payload;
}
void CmndDimmer(void)
{
// Dimmer - Show current Dimmer state
@ -2926,12 +2964,11 @@ void CmndDimmer(void)
dimmer = light_state.getDimmer(XdrvMailbox.index);
}
// Handle +/-/!/</> special commands
if (1 == XdrvMailbox.data_len) {
if ('+' == XdrvMailbox.data[0]) {
XdrvMailbox.payload = (dimmer > (100 - Settings->dimmer_step - 1)) ? 100 : dimmer + Settings->dimmer_step;
} else if ('-' == XdrvMailbox.data[0]) {
XdrvMailbox.payload = (dimmer < (Settings->dimmer_step + 1)) ? 1 : dimmer - Settings->dimmer_step;
} else if ('!' == XdrvMailbox.data[0] && Light.fade_running) {
int payload = DimmerStep(dimmer);
if (-1 != payload) {
XdrvMailbox.payload = payload;
} else if (1 == XdrvMailbox.data_len) {
if ('!' == XdrvMailbox.data[0] && Light.fade_running) {
XdrvMailbox.payload = LightGetCurFadeBri();
} else if ('<' == XdrvMailbox.data[0] ) {
XdrvMailbox.payload = 1;