Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove FS defines

Browse Source 
Increase boot preset max. to 250
Update changelog
Update readme
This commit is contained in:
cschwinne
2020-11-15 15:45:51 +01:00
parent 76f4c49e22
commit 595fd9377c
10 changed files with 1732 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wled00/data/index.htm
View File

@@ -204,7 +204,6 @@ button {
.tab {
background-color: transparent;
color: var(--c-d);
/*filter: drop-shadow(0px 0px 0px #111);*/
}
.bot {
@@ -511,7 +510,6 @@ input[type=range]::-moz-range-thumb {
#picker {
margin: 10px auto;
width: 260px;
/*filter: drop-shadow(0px 0px 1px #000);*/
}
#rgbwrap {
@@ -527,7 +525,6 @@ input[type=range]::-moz-range-thumb {
color: var(--c-f);
border: 0px solid white;
border-radius: 25px;
/*filter: drop-shadow(0px 0px 1px #000);*/
transition-duration: 0.5s;
-webkit-backface-visibility: hidden;
-webkit-transform:translate3d(0,0,0);
@@ -838,7 +835,6 @@ input[type=number]::-webkit-outer-spin-button {
color: var(--c-f);
border: 0px solid white;
border-radius: 20px;
/*filter: drop-shadow(0px 0px 1px #000);*/
text-align: left;
transition: background-color 0.5s;
}
@@ -1367,7 +1363,8 @@ function getLowestUnusedP()
for (var key in pJson)
{
if (key == l) l++;
}
}
if (l > 250) l = 250;
return l;
}
@@ -2005,7 +2002,7 @@ function makeP(i) {
<span class="checkmark schk"></span>
</label>
</div>
<div class="c">Save to ID <input class="noslide" id="p${i}id" type="number" oninput="checkUsed(${i})" min=1 value=${(i>0)?i:getLowestUnusedP()}></div>
<div class="c">Save to ID <input class="noslide" id="p${i}id" type="number" oninput="checkUsed(${i})" max=250 min=1 value=${(i>0)?i:getLowestUnusedP()}></div>
<div class="c">
<button class="btn btn-i btn-p" onclick="saveP(${i})"><i class="icons btn-icon">&#xe390;</i>${(i>0)?"Save changes":"Save preset"}</button>
${(i>0)?'<button class="btn btn-i btn-p" onclick="delP('+i+')"><i class="icons btn-icon">&#xe037;</i>Delete preset</button>':

2
wled00/data/settings_leds.htm
View File

@@ -151,7 +151,7 @@
<h3>Defaults</h3>
Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br>
Apply preset <input name="BP" type="number" min="0" max="16" required> at boot (0 uses defaults)
Apply preset <input name="BP" type="number" min="0" max="250" required> at boot (0 uses defaults)
<br>- <i>or</i> -<br>
Set current preset cycle setting as boot default: <input type="checkbox" name="PC"><br><br>
Use Gamma correction for color: <input type="checkbox" name="GC"> (strongly recommended)<br>

9
wled00/file.cpp
View File

@@ -4,8 +4,6 @@
* Utility for SPIFFS filesystem
*/
#ifndef WLED_DISABLE_FILESYSTEM
#ifdef ARDUINO_ARCH_ESP32 //FS info bare IDF function until FS wrapper is available for ESP32
#if WLED_FS != LITTLEFS
#include "esp_spiffs.h"
@@ -375,9 +373,8 @@ void updateFSInfo() {
fsBytesTotal = fsi.totalBytes;
#endif
}
#endif
#if !defined WLED_DISABLE_FILESYSTEM && defined WLED_ENABLE_FS_SERVING
//Un-comment any file types you need
String getContentType(AsyncWebServerRequest* request, String filename){
if(request->hasArg("download")) return "application/octet-stream";
@@ -413,7 +410,3 @@ bool handleFileRead(AsyncWebServerRequest* request, String path){
}
return false;
}
#else
bool handleFileRead(AsyncWebServerRequest*, String path){return false;}
#endif

4
wled00/html_settings.h
View File

@@ -109,8 +109,8 @@ value="3">RBG</option><option value="4">BGR</option><option value="5">GBR
</option></select><h3>Defaults</h3>Turn LEDs on after power up/reset: <input
type="checkbox" name="BO"><br>Default brightness: <input name="CA"
type="number" min="0" max="255" required> (0-255)<br><br>Apply preset <input
name="BP" type="number" min="0" max="16" required> at boot (0 uses defaults)<br>
- <i>or</i> -<br>Set current preset cycle setting as boot default: <input
name="BP" type="number" min="0" max="250" required> at boot (0 uses defaults)
<br>- <i>or</i> -<br>Set current preset cycle setting as boot default: <input
type="checkbox" name="PC"><br><br>Use Gamma correction for color: <input
type="checkbox" name="GC"> (strongly recommended)<br>
Use Gamma correction for brightness: <input type="checkbox" name="GB">

3375
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

5
wled00/wled.cpp
View File

@@ -323,6 +323,11 @@ void WLED::beginStrip()
#endif
if (bootPreset > 0) applyPreset(bootPreset);
if (turnOnAtBoot) {
bri = (briS > 0) ? briS : 128;
} else {
briLast = briS; bri = 0;
}
colorUpdated(NOTIFIER_CALL_MODE_INIT);
// init relay pin

4
wled00/wled.h
View File

@@ -35,9 +35,7 @@
#define WLED_ENABLE_WEBSOCKETS
#endif
//#define WLED_DISABLE_FILESYSTEM // FS used by new preset functionality
#define WLED_ENABLE_FS_SERVING // Enable sending html file from SPIFFS before serving progmem version
#define WLED_ENABLE_FS_EDITOR // enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock
#define WLED_ENABLE_FS_EDITOR // enable /edit page for editing FS content. Will also be disabled with OTA lock
// to toggle usb serial debug (un)comment the following line
//#define WLED_DEBUG

6
wled00/wled_server.cpp
View File

@@ -124,7 +124,7 @@ void initServer()
//if OTA is allowed
if (!otaLock){
#if !defined WLED_DISABLE_FILESYSTEM && defined WLED_ENABLE_FS_EDITOR
#ifdef WLED_ENABLE_FS_EDITOR
#ifdef ARDUINO_ARCH_ESP32
server.addHandler(new SPIFFSEditor(WLED_FS));//http_username,http_password));
#else
@@ -216,9 +216,7 @@ void initServer()
#ifndef WLED_DISABLE_ALEXA
if(espalexa.handleAlexaApiCall(request)) return;
#endif
#ifdef WLED_ENABLE_FS_SERVING
if(handleFileRead(request, request->url())) return;
#endif
request->send(404, "text/plain", "Not Found");
});
}
@@ -236,9 +234,7 @@ void serveIndexOrWelcome(AsyncWebServerRequest *request)
void serveIndex(AsyncWebServerRequest* request)
{
#ifdef WLED_ENABLE_FS_SERVING
if (handleFileRead(request, "/index.htm")) return;
#endif
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_index, PAGE_index_L);