asaril/McLighting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #123 from debsahu/master

Browse source 
fixed error in speed control from HA.
This commit is contained in:
Deb 2018-04-07 22:11:22 -04:00 committed by GitHub
commit 801f368373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Arduino/McLighting/McLighting.ino
View file

@ -863,7 +863,7 @@ void loop() {
if (mode == SET_MODE) { if (mode == SET_MODE) {
DBG_OUTPUT_PORT.printf("SET_MODE: %d %d\n", ws2812fx_mode, mode); DBG_OUTPUT_PORT.printf("SET_MODE: %d %d\n", ws2812fx_mode, mode);
strip.setMode(ws2812fx_mode); strip.setMode(ws2812fx_mode);
mode = HOLD; mode = SETSPEED;
} }
if (mode == OFF) { if (mode == OFF) {
// strip.setColor(0,0,0); // strip.setColor(0,0,0);
@ -882,7 +882,7 @@ void loop() {
} }
if (mode == SETSPEED) { if (mode == SETSPEED) {
strip.setSpeed(convertSpeed(ws2812fx_speed)); strip.setSpeed(convertSpeed(ws2812fx_speed));
// mode = HOLD; mode = HOLD;
} }
if (mode == BRIGHTNESS) { if (mode == BRIGHTNESS) {
strip.setBrightness(brightness); strip.setBrightness(brightness);

2
Arduino/McLighting/request_handlers.h
View file

@ -746,7 +746,7 @@ void checkForRequests() {
uint8_t json_speed = constrain((uint8_t) root["speed"], 0, 255); uint8_t json_speed = constrain((uint8_t) root["speed"], 0, 255);
if (json_speed != ws2812fx_speed) { if (json_speed != ws2812fx_speed) {
ws2812fx_speed = json_speed; ws2812fx_speed = json_speed;
mode = SETSPEED; if(stateOn) mode = SETSPEED;
} }
} }