From 7a22c4e169f6fc55675a5e143f2783c17a76a8d5 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 12 Dec 2017 20:22:12 +0100 Subject: [PATCH] Fixed severe error that made notifications button not work Updated binaries --- ...1712121_RGB.bin => wled04_1712122_RGB.bin} | Bin 352640 -> 352624 bytes ...12121_RGBW.bin => wled04_1712122_RGBW.bin} | Bin 352800 -> 352784 bytes wled00/WS2812FX.h | 2 +- wled00/data/index-min.htm | 4 ++-- wled00/data/index.htm | 5 ++--- wled00/htmls00.h | 2 +- wled00/wled00.ino | 4 ++-- 7 files changed, 8 insertions(+), 9 deletions(-) rename bin/{wled04_1712121_RGB.bin => wled04_1712122_RGB.bin} (95%) rename bin/{wled04_1712121_RGBW.bin => wled04_1712122_RGBW.bin} (95%) diff --git a/bin/wled04_1712121_RGB.bin b/bin/wled04_1712122_RGB.bin similarity index 95% rename from bin/wled04_1712121_RGB.bin rename to bin/wled04_1712122_RGB.bin index cf9c17f656da1a8bcb68d21e19cc1c94c30c35dd..da89eec63f60896180047b8a7d09ebd9cd21a540 100644 GIT binary patch delta 1859 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 oZwW_TJ3aLjj%pA8U)j#sB~S delta 1898 zcmWmEdvFs~6bIlv_wH?pr8S|{5(OF{P#y)MSf_#|ThZYm+VC1FQV9ykW7Hrz!hq8t zus~ZYlG4@#Rv^ej6qGQ~DatU7I!@J!4L$}dnEJ~f-`ul%vv==3=VSw? zGlHixLfx(8txvVKTIo*x4abs^)LCETX^}Lq{{HEsiiK8Hzo72$Ad1x6uUq~Ja7TABp+X2M4Y7jmZkJhKDFyfFou!P#xIfN0;@Ka@Xit^FT^p2vK zIdL1gmG%*`WNz6;r^sPW*-n=&F5Jn3!92W-ngrJVWhbRen;-Z7sf@b=7=sYv)OV?t zD9lGIsDmhK*6b#?&<>iv?xw@!;N9<2I+4q)+e1tqUKFHFlDzzPC2=yca+N_Q|CB1KBt>|OO^ni2Eb%Cx$q=m>SaSa` zkxj}PLQn9e98r-%Uh~B~F^2qHlP8{#NnuQBb^PxbF^epYIvg9kT%0d1C#fLfFy}rd z&_7WwcwCIvEyiIS7o6tSiQ<~j8u+D2;wy=CJp7a>B$RJsp*U}GHDIZ;PGcq)d&CJs z!uw1Wo2rXQ9^6vSGI{k!ftIu zO3L~hb$`X(ZEwciE?iGWc|2TKCYn%1e(^mqDyhW#iPM-=+23#-#mm8uYb(as5#$>} z5C9)|zy(%_aiSiHUP|;W=D`ClaDWC;tQCeJ_~u!Sem`}&ewIB>hQD0>?bcuRcGg*z za#p3dNwxrX7lZ)btd+*yVeYqIER*VIT>om8SBvcwKN_$jy`#C`8RII*c!_zP*raXg5O=yGe}F0@i}Sd3SRTAdY5WZ8f@Ka}$KUxdiZnN}Heto;zJ;5>@hw8FI8vbGV^MrV1L%pFblXN}&U0 z=K^`2c9~~hkY)6?IcuT(gG%_xMRJy)BCcK{yX$1<#+T)*J&Ac}sa%|nRPHckYg(%3 z6wV3;#CY`qIZYz3%{6jmPqg-w<1&3DK4bH5$aH~^#EK5NN!{f;?KJ+pThp{Noc6aI zk*oq|5sknL z7$Q*g^jmfhMjw~=Q`3|^ikLLb*VWb4p=oKFhF)_d`i)h#sz`j|_YPKFB(xL!!BF)L oq0&opRAz?l5&X%2^J+!}u0{qJ4{~{d`o0_G^U6u8ER)v!5A|)rq5uE@ diff --git a/wled00/WS2812FX.h b/wled00/WS2812FX.h index 74d5b0997..e315e6c21 100644 --- a/wled00/WS2812FX.h +++ b/wled00/WS2812FX.h @@ -1,4 +1,4 @@ -#define RGBW +//#define RGBW /* WS2812FX.h - Library for WS2812 LED effects. diff --git a/wled00/data/index-min.htm b/wled00/data/index-min.htm index 5075dfcac..39cd80918 100644 --- a/wled00/data/index-min.htm +++ b/wled00/data/index-min.htm @@ -1,8 +1,8 @@ -WLED 0.4p - +WLED 0.4 + diff --git a/wled00/data/index.htm b/wled00/data/index.htm index f7ee2c401..1d4b8c0f5 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -59,8 +59,8 @@ d.Cf.SX.value = this.responseXML.getElementsByTagName('sx')[0].childNodes[0].nodeValue; nla = (this.responseXML.getElementsByTagName('nl')[0].innerHTML)!=0?true:false; nState = 0; - nState = (this.responseXML.getElementsByTagName('nr')[0].innerHTML)!=0?true:false; - nState += 2*(this.responseXML.getElementsByTagName('ns')[0].innerHTML)!=0?true:false; + nState = (this.responseXML.getElementsByTagName('nr')[0].innerHTML)!=0?1:0; + nState += (this.responseXML.getElementsByTagName('ns')[0].innerHTML)!=0?2:0; hsb = (this.responseXML.getElementsByTagName('md')[0].innerHTML)!=0?true:false; d.getElementsByClassName("desc")[0].innerHTML = this.responseXML.getElementsByTagName('desc')[0].innerHTML; UV(); @@ -68,7 +68,6 @@ } } } - // send HTTP request request.open("GET", "win/" +resp +nocache, true); request.send(null); resp=""; diff --git a/wled00/htmls00.h b/wled00/htmls00.h index 4fce45167..c6d3b432d 100644 --- a/wled00/htmls00.h +++ b/wled00/htmls00.h @@ -26,7 +26,7 @@ const char PAGE_index0[] PROGMEM = R"=====( WLED 0.4 - + )====="; diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 0c7dab29a..e2445301a 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -20,7 +20,7 @@ #include "WS2812FX.h" //version in format yymmddb (b = daily build) -#define VERSION 1712121 +#define VERSION 1712122 //If you have an RGBW strip, uncomment first line in WS2812FX.h! @@ -96,7 +96,7 @@ boolean turnOnAtBoot = true; uint8_t bootPreset = 0; byte col_s[]{255, 159, 0}; byte col_sec_s[]{0, 0, 0}; -boolean useRGBW = true; +boolean useRGBW = false; byte white_s = 0; byte white_sec_s = 0; byte bri_s = 127;