From 081a6888fa0d6cbc29cdfdc282f7e1377fe852f9 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 14 Jan 2020 10:59:57 +0100 Subject: [PATCH] Remove G and S options (only segment properties now) --- wled00/data/settings_leds.htm | Bin 7982 -> 16312 bytes wled00/html_settings.h | 7 +++---- wled00/wled00.ino | 4 +--- wled00/wled01_eeprom.ino | 6 ------ wled00/wled02_xml.ino | 2 -- wled00/wled03_set.ino | 6 ++---- wled00/wled05_init.ino | 7 +------ 7 files changed, 7 insertions(+), 25 deletions(-) diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index eb9774593584332f4a0e23e70d1617231e8f3041..450512b0270776388ca3f5133829d469be188177 100644 GIT binary patch literal 16312 zcmds;eNP<85yt!9jg;>&;dD0688G&7xnS%QZ|AdOUo3-tI-O1t7%;@Vg#`n#l8>I` z`E_k=chAhSyI?y}v;uZ!x~uE;sp{(C-~U<&zY8nj&tW;Nho8fXuo|kc8&1PP*bk4x zZ^LiGLd*4b*a%y_=aptGX#BQjZRqPjmrpX%wU_}|uQ&m_@`Xsqe# zRG&T3cq`r(!c4sKaYzbRU9EPaQO9~}ydoc;_fe`!>ps%Yk;a`xuHo#iR@=~=6Rq+- z@-!D7M(uS(bw?u)HJ;UxqzXTT$#AFt{6qg+CrWl0>7R#bjXsW2Pf9+la;ocYm>2Ie zk^(7rMSD{t(b0kKF6!<{ygJgIce>iv-Jg1Tn2GecJJZm}7g1wdvXfaZ>1sl}CTafB z=e8-=(lz9oX<6^CT5 z$2WYe*~+hSzhF)!+v6eAvJU>X8g+_q<0VVsGCbAO$#7fVvKgP<7C%^TS7YADUfX(Z zy3W^t;+ixuEeRI&8(-X)<+pn)PR14P=;}NDN&r+CF{I?4x{IDbvF*{R$n7bGs4QPa~4xyT>tGLE~w}o~yk1 zPSpB`i0kfu{`ZaOKm~7~*YA&`gPn+9(0wSHCE9XlGiK5a;bBu!I7?hT$oLwrJ4TO7 zf37e0DD=tuS|x{aa%ZfuDc-B-F`*W(KDlB z6sO}{Dn=?Tlh0P(iPVU+z1|G-EUp&xvmfoW7rxR5Ov}0Ms8WO9Uo`jEk+Rt+QFkIP zHzku{Z&^`{gQ_N9({eekV#!f>Li1bViT%J~tOwqXoWY^*5wTokwMvzF6=oI7e8!Q@ zQEgQI*_RyOnE&UEnhpN{plaqO{MYRtMFWwCQ_(q zw`Ff4ZL(*nN|9h*xJ)V?yD$c;??#g6MbDxNc$5#u3W#il5ubIo7TynPDI{wp1o7R zt^>RWd#Z^0Rd4^>ZOB!RBDbuqjpngdnZ_QyyQC9}SI=z+%5m(pu>Focrq!%(uFB zO*oc2fAqwf{V(f^`TpPgcO6CWiTvXz`bW<3lsZTos&0<7I^Oq1^qrjoy&1DvjCmkL ze9##4rWkWy-j(aMBPvspYxr8-VvN-dzKbd?v?;!~qCRt(hzL43Q<8<60L@-T>0U>D zZ|N>wOd{h4-Pwy&jhwmZ>i;$TYD#*>rP*ex-e z)wlGQ{wo%vqfO8ETya|I&YbRF6yN+#u7CGBs*PNy9&hM_-Z(oGdWX5kwP^~ja{3-Y zIqlBaa_3qzi%lyMu?1d>4(YXzvU1rOgce?q{D+PweRJQ{8^V1)y@S6V$6fLEci9>) z@nh_n$79`(zrAwARJ7r7q((hhQcL!pmR3QB<5+Ly_8t`fAoz}`=e%(?0{?!VfDH7L z&02Vrcb81V>9k}%eAAFMac9-4W%>UlZ=Ac9Hzr%xF*}c;H{pBvC_RAT82$M?HQ9s+ zI*usu|6q~NkFZI9zbGy)rAy8k52euqMGRQ~t1O>KVjeA3_*!EQvgmWmSgll6McgC4 z)7dCBtk)AD5BSGZ&M@t)DnGZhy8A%?E|NbIn?`Y<-35u@QY&qqmL6U7r&MH*;P;k=8q>`W6n--*&pF$3B&Jsxtd zZnB=8HL~84B!Y{!RR^!Y&T&)P14p5L7fJzeq}_sF)69`w?Q94nQz7gZVcG5u${*UdV?PX`}ruIbr1@V~dTkNBhB zAm9UypQAqUey>Q82@PA-K}}^`kr}}q?94t1ZmiG5UWlD1p1|H}TK2O&XT2)`7q2ve z-4q&N4mP4LWJT{qranUzk%pDL2V=2pv!Da|`0o0mH=5IW;%Zx+oY^{)MQ{%O<_n8V(b_s;08!PDr->0I!a$bKyUs$&D)7n+!YAD~NpO z!?ROA{o^AGRl*i$fYPzLfh zk=k;Htw2W%{X)Ud�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 JKizBb{{UG%Wp@Ao diff --git a/wled00/html_settings.h b/wled00/html_settings.h index e66c99020..25bed845f 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -123,6 +123,8 @@ Color order: + +

Defaults

Turn LEDs on after power up/reset:
@@ -150,10 +152,7 @@ Palette blending:
Reverse LED order (rotate 180):
-Skip first LED:
-LED spacing:
-(Turns off N LEDs between each lit one, spacing out effects)
-LED grouping:
+Skip first LED:
)====="; diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 996b0a0a2..111304e55 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -98,7 +98,7 @@ //version code in format yymmddb (b = daily build) -#define VERSION 2001051 +#define VERSION 2001071 char versionString[] = "0.9.0-b2"; @@ -149,8 +149,6 @@ bool enableSecTransition = true; //also enable transition for secon uint16_t transitionDelay = 750; //default crossfade duration in ms bool skipFirstLed = false; //ignore first LED in strip (useful if you need the LED as signal repeater) -uint8_t spacing = 0; //disables N LEDs between active nodes. (Useful for spacing out lights for more traditional christmas light look) -uint8_t group = 1; //Group LEDs into one logical LED byte briMultiplier = 100; //% of brightness to set (to limit power, if you set it to 50 and set bri to 255, actual brightness will be 127) diff --git a/wled00/wled01_eeprom.ino b/wled00/wled01_eeprom.ino index da6ae783f..790ed1a46 100644 --- a/wled00/wled01_eeprom.ino +++ b/wled00/wled01_eeprom.ino @@ -230,9 +230,6 @@ void saveSettingsToEEPROM() saveCurrPresetCycConf = false; } - EEPROM.write(2213, spacing); - EEPROM.write(2214, group); - writeStringToEEPROM(2220, blynkApiKey, 35); for (int i = 0; i < 8; ++i) @@ -491,9 +488,6 @@ void loadSettingsFromEEPROM(bool first) presetApplyFx = EEPROM.read(2212); } - spacing = EEPROM.read(2213); - group = max(1, EEPROM.read(2214)); - bootPreset = EEPROM.read(389); wifiLock = EEPROM.read(393); utcOffsetSecs = EEPROM.read(394) + ((EEPROM.read(395) << 8) & 0xFF00); diff --git a/wled00/wled02_xml.ino b/wled00/wled02_xml.ino index b758bbcfd..b7110dcbc 100644 --- a/wled00/wled02_xml.ino +++ b/wled00/wled02_xml.ino @@ -237,8 +237,6 @@ void getSettingsJS(byte subPage, char* dest) sappend('i',"PB",strip.paletteBlend); sappend('c',"RV",strip.reverseMode); sappend('c',"SL",skipFirstLed); - sappend('v',"SP",spacing); - sappend('v',"GR",group); } if (subPage == 3) diff --git a/wled00/wled03_set.ino b/wled00/wled03_set.ino index 5504cc265..3db104258 100644 --- a/wled00/wled03_set.ino +++ b/wled00/wled03_set.ino @@ -104,8 +104,6 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) if (t >= 0 && t < 4) strip.paletteBlend = t; strip.reverseMode = request->hasArg("RV"); skipFirstLed = request->hasArg("SL"); - spacing = request->arg("SP").toInt(); - group = request->arg("GR").toInt(); t = request->arg("BF").toInt(); if (t > 0) briMultiplier = t; } @@ -291,7 +289,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) } if (subPage != 6 || !doReboot) saveSettingsToEEPROM(); //do not save if factory reset if (subPage == 2) { - strip.init(useRGBW,ledCount,group,spacing,skipFirstLed); + strip.init(useRGBW,ledCount,skipFirstLed); } if (subPage == 4) alexaInit(); } @@ -392,7 +390,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req) if (pos > 0) { stopI = getNumVal(&req, pos); } - strip.setSegment(main, startI, stopI, 1, 0); + strip.setSegment(main, startI, stopI); main = strip.getMainSegmentId(); diff --git a/wled00/wled05_init.ino b/wled00/wled05_init.ino index f31383f29..0d113b46d 100644 --- a/wled00/wled05_init.ino +++ b/wled00/wled05_init.ino @@ -8,11 +8,6 @@ void wledInit() ledCount = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00); if (ledCount > MAX_LEDS || ledCount == 0) ledCount = 30; - spacing = EEPROM.read(2213); - //this was reading 255 after inital flash causing bootloop. Don't know why. - spacing = spacing!= 255 ? spacing : 0; - group = max(1, EEPROM.read(2214)); - #ifdef ESP8266 #if LEDPIN == 3 if (ledCount > MAX_LEDS_DMA) ledCount = MAX_LEDS_DMA; //DMA method uses too much ram @@ -31,7 +26,7 @@ void wledInit() DEBUG_PRINT("heap "); DEBUG_PRINTLN(ESP.getFreeHeap()); - strip.init(EEPROM.read(372),ledCount,group,spacing,EEPROM.read(2204)); //init LEDs quickly + strip.init(EEPROM.read(372),ledCount,EEPROM.read(2204)); //init LEDs quickly strip.setBrightness(0); DEBUG_PRINT("LEDs inited. heap usage ~");