mirror of
https://github.com/wled/WLED.git
synced 2025-07-10 12:26:31 +00:00
Minor fixes.
- reversed condition for simplified UI - removed duplicate code
This commit is contained in:
parent
557a2f08f7
commit
73e898773b
@ -749,12 +749,6 @@ void WS2812FX::makeAutoSegments(bool forceReset) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (forceReset) {
|
|
||||||
for (uint8_t i = 0; i < MAX_NUM_SEGMENTS; i++) {
|
|
||||||
setSegment(i, 0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (getActiveSegmentsNum() < 2) {
|
if (getActiveSegmentsNum() < 2) {
|
||||||
setSegment(mainSeg, 0, _length);
|
setSegment(mainSeg, 0, _length);
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
|
|||||||
getStringFromJson(cmDNS, id[F("mdns")], 33);
|
getStringFromJson(cmDNS, id[F("mdns")], 33);
|
||||||
getStringFromJson(serverDescription, id[F("name")], 33);
|
getStringFromJson(serverDescription, id[F("name")], 33);
|
||||||
getStringFromJson(alexaInvocationName, id[F("inv")], 33);
|
getStringFromJson(alexaInvocationName, id[F("inv")], 33);
|
||||||
#ifndef WLED_DISABLE_SIMPLE_UI
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
CJSON(simplifiedUI, id[F("sui")]);
|
CJSON(simplifiedUI, id[F("sui")]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -509,7 +509,9 @@ void serializeConfig() {
|
|||||||
id[F("mdns")] = cmDNS;
|
id[F("mdns")] = cmDNS;
|
||||||
id[F("name")] = serverDescription;
|
id[F("name")] = serverDescription;
|
||||||
id[F("inv")] = alexaInvocationName;
|
id[F("inv")] = alexaInvocationName;
|
||||||
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
id[F("sui")] = simplifiedUI;
|
id[F("sui")] = simplifiedUI;
|
||||||
|
#endif
|
||||||
|
|
||||||
JsonObject nw = doc.createNestedObject("nw");
|
JsonObject nw = doc.createNestedObject("nw");
|
||||||
|
|
||||||
|
@ -205,7 +205,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
|
|||||||
{
|
{
|
||||||
strlcpy(serverDescription, request->arg(F("DS")).c_str(), 33);
|
strlcpy(serverDescription, request->arg(F("DS")).c_str(), 33);
|
||||||
syncToggleReceive = request->hasArg(F("ST"));
|
syncToggleReceive = request->hasArg(F("ST"));
|
||||||
#ifndef WLED_DISABLE_SIMPLE_UI
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
if (simplifiedUI ^ request->hasArg(F("SU"))) {
|
if (simplifiedUI ^ request->hasArg(F("SU"))) {
|
||||||
// UI selection changed, invalidate browser cache
|
// UI selection changed, invalidate browser cache
|
||||||
cacheInvalidate++;
|
cacheInvalidate++;
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2203282
|
#define VERSION 2203310
|
||||||
|
|
||||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||||
//#define WLED_USE_MY_CONFIG
|
//#define WLED_USE_MY_CONFIG
|
||||||
@ -143,7 +143,7 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
|
|||||||
|
|
||||||
#include "fcn_declare.h"
|
#include "fcn_declare.h"
|
||||||
#include "html_ui.h"
|
#include "html_ui.h"
|
||||||
#ifndef WLED_DISABLE_SIMPLE_UI
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
#include "html_simple.h"
|
#include "html_simple.h"
|
||||||
#endif
|
#endif
|
||||||
#include "html_settings.h"
|
#include "html_settings.h"
|
||||||
@ -462,10 +462,9 @@ WLED_GLOBAL byte colNlT[] _INIT_N(({ 0, 0, 0, 0 })); // current nightligh
|
|||||||
// brightness
|
// brightness
|
||||||
WLED_GLOBAL unsigned long lastOnTime _INIT(0);
|
WLED_GLOBAL unsigned long lastOnTime _INIT(0);
|
||||||
WLED_GLOBAL bool offMode _INIT(!turnOnAtBoot);
|
WLED_GLOBAL bool offMode _INIT(!turnOnAtBoot);
|
||||||
WLED_GLOBAL byte bri _INIT(briS);
|
WLED_GLOBAL byte bri _INIT(briS); // global brightness (set)
|
||||||
WLED_GLOBAL byte briOld _INIT(0);
|
WLED_GLOBAL byte briOld _INIT(0); // global brightnes while in transition loop (previous iteration)
|
||||||
WLED_GLOBAL byte briT _INIT(0);
|
WLED_GLOBAL byte briT _INIT(0); // global brightness during transition
|
||||||
WLED_GLOBAL byte briIT _INIT(0);
|
|
||||||
WLED_GLOBAL byte briLast _INIT(128); // brightness before turned off. Used for toggle function
|
WLED_GLOBAL byte briLast _INIT(128); // brightness before turned off. Used for toggle function
|
||||||
WLED_GLOBAL byte whiteLast _INIT(128); // white channel before turned off. Used for toggle function
|
WLED_GLOBAL byte whiteLast _INIT(128); // white channel before turned off. Used for toggle function
|
||||||
|
|
||||||
|
@ -225,6 +225,7 @@ void initServer()
|
|||||||
size_t len, bool final) {handleUpload(request, filename, index, data, len, final);}
|
size_t len, bool final) {handleUpload(request, filename, index, data, len, final);}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
server.on("/simple.htm", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/simple.htm", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
if (handleFileRead(request, "/simple.htm")) return;
|
if (handleFileRead(request, "/simple.htm")) return;
|
||||||
if (handleIfNoneMatchCacheHeader(request)) return;
|
if (handleIfNoneMatchCacheHeader(request)) return;
|
||||||
@ -233,6 +234,7 @@ void initServer()
|
|||||||
setStaticContentCacheHeaders(response);
|
setStaticContentCacheHeaders(response);
|
||||||
request->send(response);
|
request->send(response);
|
||||||
});
|
});
|
||||||
|
#endif
|
||||||
|
|
||||||
server.on("/iro.js", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/iro.js", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", iroJs, iroJs_length);
|
AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", iroJs, iroJs_length);
|
||||||
@ -388,7 +390,7 @@ void serveIndex(AsyncWebServerRequest* request)
|
|||||||
if (handleIfNoneMatchCacheHeader(request)) return;
|
if (handleIfNoneMatchCacheHeader(request)) return;
|
||||||
|
|
||||||
AsyncWebServerResponse *response;
|
AsyncWebServerResponse *response;
|
||||||
#ifndef WLED_DISABLE_SIMPLE_UI
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
if (simplifiedUI)
|
if (simplifiedUI)
|
||||||
response = request->beginResponse_P(200, "text/html", PAGE_simple, PAGE_simple_L);
|
response = request->beginResponse_P(200, "text/html", PAGE_simple, PAGE_simple_L);
|
||||||
else
|
else
|
||||||
|
@ -406,7 +406,9 @@ void getSettingsJS(byte subPage, char* dest)
|
|||||||
{
|
{
|
||||||
sappends('s',SET_F("DS"),serverDescription);
|
sappends('s',SET_F("DS"),serverDescription);
|
||||||
sappend('c',SET_F("ST"),syncToggleReceive);
|
sappend('c',SET_F("ST"),syncToggleReceive);
|
||||||
|
#ifdef WLED_ENABLE_SIMPLE_UI
|
||||||
sappend('c',SET_F("SU"),simplifiedUI);
|
sappend('c',SET_F("SU"),simplifiedUI);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (subPage == 4)
|
if (subPage == 4)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user