From 1c3878fcb0aa9ebc53674cd5d8672f4770acf715 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Sun, 29 Jul 2018 14:03:02 +0200 Subject: [PATCH] Added blynk UI updates --- readme.md | 3 ++- wled00/wled00.ino | 2 +- wled00/wled07_notify.ino | 1 + wled00/wled08_led.ino | 4 +++- wled00/wled16_blynk.ino | 20 ++++++++++++++++---- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/readme.md b/readme.md index 51a14402..c95fb2bb 100644 --- a/readme.md +++ b/readme.md @@ -2,11 +2,12 @@ WLED is a fast and (relatively) secure implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B) LEDs! -### Features: (V0.7.0) +### Features: (V0.7.1) - RGB, HSB, and brightness sliders - All new, mobile-friendly web UI! - Settings page - configuration over network - Access Point and station mode - automatic failsafe AP +- Support of Blynk IoT cloud - WS2812FX library integrated for over 50 special effects (+Custom Theater Chase)! - Secondary color support lets you use even more effect combinations - Alexa smart home device server (including dimming) diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 6615aa24..eae94b4f 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -38,7 +38,7 @@ #include "src/dependencies/blynk/BlynkSimpleEsp.h" //version in format yymmddb (b = daily build) -#define VERSION 1807221 +#define VERSION 1807291 char versionString[] = "0.7.1"; //AP and OTA default passwords (change them!) diff --git a/wled00/wled07_notify.ino b/wled00/wled07_notify.ino index 72965575..4975d34d 100644 --- a/wled00/wled07_notify.ino +++ b/wled00/wled07_notify.ino @@ -16,6 +16,7 @@ void notify(byte callMode, bool followUp=false) case 6: if (!notifyDirect) return; break; //fx change case 7: if (!notifyHue) return; break; case 8: if (!notifyDirect) return; break; + case 9: if (!notifyDirect) return; break; default: return; } byte udpOut[WLEDPACKETSIZE]; diff --git a/wled00/wled08_led.ino b/wled00/wled08_led.ino index f4e83cc9..a309ff50 100644 --- a/wled00/wled08_led.ino +++ b/wled00/wled08_led.ino @@ -67,7 +67,7 @@ bool colorChanged() void colorUpdated(int callMode) { - //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (NN)6: fx changed 7: hue 8: preset cycle + //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (NN)6: fx changed 7: hue 8: preset cycle 9: blynk if (!colorChanged()) { if (callMode == 6) notify(6); @@ -117,6 +117,7 @@ void colorUpdated(int callMode) setLedsStandard(); strip.trigger(); } + if (callMode != 9 && callMode != 5 && callMode != 8) updateBlynk(); } void handleTransitions() @@ -194,6 +195,7 @@ void handleNightlight() bri = nightlightTargetBri; colorUpdated(5); } + updateBlynk(); if (bri == 0) briLast = briNlT; } } else if (nightlightActiveOld) //early de-init diff --git a/wled00/wled16_blynk.ino b/wled00/wled16_blynk.ino index 27becbc2..4120f03b 100644 --- a/wled00/wled16_blynk.ino +++ b/wled00/wled16_blynk.ino @@ -18,24 +18,36 @@ void handleBlynk() Blynk.run(); } +void updateBlynk() +{ + Blynk.virtualWrite(V0,bri); + //we need a RGB -> HSB convert here + Blynk.virtualWrite(V3,bri); + Blynk.virtualWrite(V4,effectCurrent); + Blynk.virtualWrite(V5,effectSpeed); + Blynk.virtualWrite(V6,effectIntensity); + Blynk.virtualWrite(V7,nightlightActive); + Blynk.virtualWrite(V8,notifyDirect); +} + BLYNK_WRITE(V0) { bri = param.asInt();//bri - colorUpdated(1); + colorUpdated(9); } BLYNK_WRITE(V1) { blHue = param.asInt();//hue colorHStoRGB(blHue*10,blSat,(false)? colSec:col); - colorUpdated(1); + colorUpdated(9); } BLYNK_WRITE(V2) { blSat = param.asInt();//sat colorHStoRGB(blHue*10,blSat,(false)? colSec:col); - colorUpdated(1); + colorUpdated(9); } BLYNK_WRITE(V3) @@ -46,7 +58,7 @@ BLYNK_WRITE(V3) BLYNK_WRITE(V4) { effectCurrent = param.asInt()-1;//fx - colorUpdated(6); + colorUpdated(9); } BLYNK_WRITE(V5)