Browse Source

Merge pull request #1607 from tsymbaliuk/dev

Allow to set relative brightness and relative color in mireds through…
rules-rpn
Xose Pérez 5 years ago
committed by GitHub
parent
commit
dfef249975
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
  1. +20
    -5
      code/espurna/light.ino

+ 20
- 5
code/espurna/light.ino View File

@ -989,8 +989,15 @@ void _lightInitCommands() {
terminalRegisterCommand(F("BRIGHTNESS"), [](Embedis* e) { terminalRegisterCommand(F("BRIGHTNESS"), [](Embedis* e) {
if (e->argc > 1) { if (e->argc > 1) {
lightBrightness(String(e->argv[1]).toInt());
lightUpdate(true, true);
const String value(e->argv[1]);
if( value.length() > 0 ) {
if( value[0] == '+' || value[0] == '-' ) {
lightBrightness(lightBrightness()+String(e->argv[1]).toInt());
} else {
lightBrightness(String(e->argv[1]).toInt());
}
lightUpdate(true, true);
}
} }
DEBUG_MSG_P(PSTR("Brightness: %d\n"), lightBrightness()); DEBUG_MSG_P(PSTR("Brightness: %d\n"), lightBrightness());
terminalOK(); terminalOK();
@ -1032,9 +1039,17 @@ void _lightInitCommands() {
terminalRegisterCommand(F("MIRED"), [](Embedis* e) { terminalRegisterCommand(F("MIRED"), [](Embedis* e) {
if (e->argc > 1) { if (e->argc > 1) {
String color = String("M") + String(e->argv[1]);
lightColor(color.c_str());
lightUpdate(true, true);
const String value(e->argv[1]);
String color = String("M");
if( value.length() > 0 ) {
if( value[0] == '+' || value[0] == '-' ) {
color += String(_light_mireds + String(e->argv[1]).toInt());
} else {
color += String(e->argv[1]);
}
lightColor(color.c_str());
lightUpdate(true, true);
}
} }
DEBUG_MSG_P(PSTR("Color: %s\n"), lightColor().c_str()); DEBUG_MSG_P(PSTR("Color: %s\n"), lightColor().c_str());
terminalOK(); terminalOK();


Loading…
Cancel
Save