diff --git a/wled00/data/index.js b/wled00/data/index.js index 86aec21dd..f58959d35 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -158,8 +158,8 @@ function cTheme(light) { function loadBg(iUrl) { - let bg = document.getElementById('bg'); - let img = document.createElement("img"); + let bg = gId('bg'); + let img = d.createElement("img"); img.src = iUrl; if (iUrl == "" || iUrl==="https://picsum.photos/1920/1080") { var today = new Date(); @@ -171,7 +171,7 @@ function loadBg(iUrl) if (today>=hs && today<=he) img.src = hol[i][4]; } } - img.addEventListener('load', (event) => { + img.addEventListener('load', (e) => { var a = parseFloat(cfg.theme.alpha.bg); if (isNaN(a)) a = 0.6; bg.style.opacity = a; @@ -184,8 +184,8 @@ function loadSkinCSS(cId) { if (!gId(cId)) // check if element exists { - var h = document.getElementsByTagName('head')[0]; - var l = document.createElement('link'); + var h = d.getElementsByTagName('head')[0]; + var l = d.createElement('link'); l.id = cId; l.rel = 'stylesheet'; l.type = 'text/css'; @@ -260,7 +260,6 @@ function onLoad() if (localStorage.getItem('pcm') == "true") togglePcMode(true); var sls = d.querySelectorAll('input[type="range"]'); for (var sl of sls) { - //sl.addEventListener('input', updateBubble, true); sl.addEventListener('touchstart', toggleBubble); sl.addEventListener('touchend', toggleBubble); } @@ -557,7 +556,7 @@ function populatePresets(fromls) if (expanded[i+100]) expand(i+100, true); } } else { presetError(true); } - updatePA(true); + updatePA(); populateQL(); } @@ -735,9 +734,7 @@ function populateSegments(s) function btype(b) { switch (b) { - case 2: case 32: return "ESP32"; - case 1: case 82: return "ESP8266"; } return "?"; @@ -935,33 +932,23 @@ function generateListItemHtml(listName, id, name, clickAction, extraHtml = '') `; } -function updateTrail(e, slidercol) +function updateTrail(e) { if (e==null) return; var max = e.hasAttribute('max') ? e.attributes.max.value : 255; var perc = e.value * 100 / max; perc = parseInt(perc); if (perc < 50) perc += 2; - var scol; - switch (slidercol) { - case 1: scol = "#f00"; break; - case 2: scol = "#0f0"; break; - case 3: scol = "#00f"; break; - default: scol = "var(--c-f)"; - } - var g = `${scol} ${perc}%, var(--c-4) ${perc}%`; - if (slidercol==4) g = `#000 0%, #fff`; - if (slidercol==5) g = `#ff8f1f 0%, #fff 50%, #d4e0ff`; - var val = `linear-gradient(90deg, ${g})`; + var val = `linear-gradient(90deg, var(--c-f) ${perc}%, var(--c-4) ${perc}%)`; e.parentNode.getElementsByClassName('sliderdisplay')[0].style.background = val; - var bubble = e.parentNode.parentNode.getElementsByTagName('output')[0]; - if (bubble) bubble.innerHTML = e.value; + var b = e.parentNode.parentNode.getElementsByTagName('output')[0]; + if (b) b.innerHTML = e.value; } function toggleBubble(e) { - var bubble = e.target.parentNode.parentNode.getElementsByTagName('output')[0]; - bubble.classList.toggle('sliderbubbleshow'); + var b = e.target.parentNode.parentNode.getElementsByTagName('output')[0]; + b.classList.toggle('sliderbubbleshow'); } function updateLen(s) @@ -989,7 +976,7 @@ function updateLen(s) gId(`seg${s}len`).innerHTML = out; } -function updatePA(scrollto=false) +function updatePA() { var ps = gEBCN("pres"); for (let i = 0; i < ps.length; i++) { @@ -1003,13 +990,11 @@ function updatePA(scrollto=false) var acv = gId(`p${currentPreset}o`); if (acv && !expanded[currentPreset+100]) { acv.classList.add('selected'); - if (scrollto) { - // scroll selected preset into view (on WS refresh) - acv.scrollIntoView({ - behavior: 'smooth', - block: 'center', - }); - } + // scroll selected preset into view (on WS refresh) + acv.scrollIntoView({ + behavior: 'smooth', + block: 'center', + }); } acv = gId(`p${currentPreset}qlb`); if (acv) acv.classList.add('selected'); @@ -1029,12 +1014,10 @@ function updateUI() updateTrail(gId('sliderBri')); updateTrail(gId('sliderSpeed')); updateTrail(gId('sliderIntensity')); - //updateTrail(gId('sliderW'),4); - //updateTrail(gId('sliderA'),5); if (isRgbw) gId('wwrap').style.display = "block"; gId("wbal").style.display = (lastinfo.leds.cct) ? "block":"none"; - updatePA(true); + updatePA(); updateHex(); updateRgb(); } @@ -1154,7 +1137,7 @@ function readState(s,command=false) b = i.col[e][2]; if (isRgbw) w = i.col[e][3]; } else { - // unsigned long RGBW (@blazoncek v2 experimental API implementation) + // unsigned long RGBW (@blazoncek v2 experimental API implementation, obsolete & will be removed) r = (i.col[e]>>16) & 0xFF; g = (i.col[e]>> 8) & 0xFF; b = (i.col[e] ) & 0xFF; @@ -1810,7 +1793,6 @@ function selectSlot(b) cd[csel].classList.add('xxs-w'); cpick.color.set(cd[csel].style.backgroundColor); gId('sliderW').value = whites[csel]; - //updateTrail(gId('sliderW'),4); updateHex(); updateRgb(); } @@ -1833,9 +1815,9 @@ function pC(col) function updateRgb() { var s,col = cpick.color.rgb; - s = gId('sliderR').value = col.r; //updateTrail(s,1); - s = gId('sliderG').value = col.g; //updateTrail(s,2); - s = gId('sliderB').value = col.b; //updateTrail(s,3); + s = gId('sliderR').value = col.r; + s = gId('sliderG').value = col.g; + s = gId('sliderB').value = col.b; } function updateHex() diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index fb235c926..203a5fbcc 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -402,29 +402,25 @@ ${i+1}: if (!o.files) { alert("This browser doesn't seem to support the `files` property of file inputs."); } else if (!o.files[0]) { - alert("Please select a file before clicking 'Load'"); + alert("Please select a JSON file before clicking 'Apply'"); } else { f = o.files[0]; fr = new FileReader(); fr.onload = receivedText; fr.readAsText(f); } - d.Sf.data2.value = ''; + o.value = ''; function receivedText(e) { let lines = e.target.result; var c = JSON.parse(lines); if (c.hw) { - //console.log(c.hw); if (c.hw.led) { for (var i=0; i<10; i++) addLEDs(-1); var l = c.hw.led; l.ins.forEach((v,i,a)=>{ addLEDs(1); - for (var j=0; j{ addBtn(i,v.pin[0],v.type); }); @@ -457,6 +454,7 @@ ${i+1}: { //values injected by server while sending HTML //d.um_p=[6,7,8,9,10,11,1];bLimits(3,4096,4000,1664);d.Sf.MS.checked=1;addLEDs(1);d.Sf.L00.value=2;d.Sf.LC0.value=30;d.Sf.LT0.value=22;d.Sf.CO0.value=0;d.Sf.LS0.value=15;d.Sf.CV0.checked=1;d.Sf.SL0.checked=0;addLEDs(1);d.Sf.L01.value=10;d.Sf.L11.value=10;d.Sf.L21.value=1;d.Sf.L31.value=10;d.Sf.LC1.value=60;d.Sf.LT1.value=80;d.Sf.CO1.value=1;d.Sf.LS1.value=0;d.Sf.CV1.checked=0;d.Sf.SL1.checked=0;d.Sf.MA.value=850;d.Sf.LA.value=0;d.Sf.CA.value=56;d.Sf.AW.value=3;d.Sf.BO.checked=1;d.Sf.BP.value=80;d.Sf.GB.checked=0;d.Sf.GC.checked=1;d.Sf.TF.checked=1;d.Sf.TD.value=700;d.Sf.PF.checked=0;d.Sf.BF.value=100;d.Sf.TB.value=0;d.Sf.TL.value=60;d.Sf.TW.value=0;d.Sf.PB.selectedIndex=0;d.Sf.RL.value=12;d.Sf.RM.checked=1;addBtn(0,0,0);addBtn(1,-1,0);d.Sf.TT.value=32;d.Sf.IR.value=-1;d.Sf.IT.value=0; + //d.um_p=[6,7,8,9,10,11,14,15,13,1,21,19,22,25,26,27,5,23,18,17];bLimits(10,2048,64000,8192);d.Sf.MS.checked=1;d.Sf.CCT.checked=0;addLEDs(1);d.Sf.L00.value=192;d.Sf.L10.value=168;d.Sf.L20.value=0;d.Sf.L30.value=61;d.Sf.LC0.value=421;d.Sf.LT0.value=80;d.Sf.CO0.value=1;d.Sf.LS0.value=0;d.Sf.CV0.checked=0;d.Sf.SL0.checked=0;d.Sf.RF0.checked=0;d.Sf.MA.value=850;d.Sf.LA.value=0;d.Sf.CA.value=127;d.Sf.AW.value=3;d.Sf.BO.checked=0;d.Sf.BP.value=0;d.Sf.GB.checked=0;d.Sf.GC.checked=1;d.Sf.TF.checked=1;d.Sf.TD.value=700;d.Sf.PF.checked=1;d.Sf.BF.value=100;d.Sf.TB.value=0;d.Sf.TL.value=60;d.Sf.TW.value=1;d.Sf.PB.selectedIndex=0;d.Sf.RL.value=-1;d.Sf.RM.checked=1;addBtn(0,-1,0);addBtn(1,-1,0);addBtn(2,-1,0);addBtn(3,-1,0);d.Sf.TT.value=32;d.Sf.IR.value=-1;d.Sf.IT.value=8; } diff --git a/wled00/data/simple.js b/wled00/data/simple.js index 978f6f4cd..e108d4c40 100644 --- a/wled00/data/simple.js +++ b/wled00/data/simple.js @@ -1171,6 +1171,7 @@ function selectSlot(b) cpick.color.set(cd[csel].style.backgroundColor); gId('sliderW').value = whites[csel]; redrawPalPrev(); + updateRgb(); } var lasth = 0; diff --git a/wled00/html_settings.h b/wled00/html_settings.h index d1affb4be..0ebd39827 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -77,7 +77,7 @@ onclick="B()">Back // Autogenerated from wled00/data/settings_leds.htm, do not edit!! const char PAGE_settings_leds[] PROGMEM = R"=====(LED Settings