diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index e4933c77..0631ad43 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1213,7 +1213,8 @@ void WS2812FX::finalizeInit(void)
}
//segments are created in makeAutoSegments();
- setBrightness(_brightness);
+ loadCustomPalettes(); // (re)load all custom palettes
+ deserializeMap(); // (re)load default ledmap
}
void WS2812FX::service() {
@@ -1749,6 +1750,7 @@ void WS2812FX::loadCustomPalettes()
{
byte tcp[72]; //support gradient palettes with up to 18 entries
CRGBPalette16 targetPalette;
+ customPalettes.clear(); // start fresh
for (int index = 0; index<10; index++) {
char fileName[32];
sprintf_P(fileName, PSTR("/palette%d.json"), index);
diff --git a/wled00/data/index.css b/wled00/data/index.css
index 65aed689..3b2171cb 100644
--- a/wled00/data/index.css
+++ b/wled00/data/index.css
@@ -740,7 +740,7 @@ input[type=range]::-moz-range-thumb {
margin-top: var(--bmt);
}
-#picker, #rgbwrap, #kwrap, #wwrap, #wbal, #vwrap, #qcs-w, #hexw, #pall {
+#picker, #rgbwrap, #kwrap, #wwrap, #wbal, #vwrap, #qcs-w, #hexw, #pall, #ledmap {
margin: 0 auto;
width: 260px;
}
@@ -898,6 +898,10 @@ div.sel-p:after {
select.sel-ple {
text-align: center;
}
+select.sel-sg {
+ margin: 5px 0;
+ height: 40px;
+}
option {
background-color: var(--c-3);
color: var(--c-f);
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
index 2cac3fc1..c91bc0c2 100644
--- a/wled00/data/index.htm
+++ b/wled00/data/index.htm
@@ -312,6 +312,7 @@
Transition: s
+
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 0062cdb1..3b8012ed 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -834,6 +834,16 @@ function populateSegments(s)
if (segCount < 2) gId(`segd${lSeg}`).style.display = "none";
if (!isM && !noNewSegs && (cfg.comp.seglen?parseInt(gId(`seg${lSeg}s`).value):0)+parseInt(gId(`seg${lSeg}e`).value) 1) ? "block":"none"; // rsbtn parent
+
+ if (Array.isArray(li.maps) && li.maps.length>1) {
+ let cont = `Ledmap:
";
+ gId("ledmap").innerHTML = cont;
+ gId("ledmap").classList.remove("hide");
+ } else {
+ gId("ledmap").classList.add("hide");
+ }
}
function populateEffects()
@@ -1844,9 +1854,9 @@ ${makePlSel(plJson[i].end?plJson[i].end:0, true)}
`;
- if (Array.isArray(lastinfo.maps) && lastinfo.maps.length>0) {
- content += `Ledmap: