lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/blazoncek/WLED into dev

Browse Source
This commit is contained in:
Blaž Kristan 2021-11-16 08:25:21 +01:00
commit bee93f4743
3 changed files with 906 additions and 903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/data/index.js
View File

@ -1,7 +1,7 @@
//page js //page js
var loc = false, locip; var loc = false, locip;
var noNewSegs = false; var noNewSegs = false;
var isOn = false, nlA = false, isLv = false, isInfo = false, isNodes = false, syncSend = false, syncTglRecv = true, isRgbw = false; var isOn = false, nlA = false, isLv = false, isInfo = false, isNodes = false, syncSend = false, syncTglRecv = true, isRgbw = false, cct = false;
var whites = [0,0,0]; var whites = [0,0,0];
var selColors; var selColors;
var expanded = [false]; var expanded = [false];
@ -478,6 +478,7 @@ function loadPalettes(callback = null)
}) })
.finally(()=>{ .finally(()=>{
if (callback) callback(); if (callback) callback();
updateUI();
}); });
} }
@ -503,6 +504,7 @@ function loadFX(callback = null)
}) })
.finally(()=>{ .finally(()=>{
if (callback) callback(); if (callback) callback();
updateUI();
}); });
} }
@ -578,6 +580,7 @@ function parseInfo() {
syncTglRecv = li.str; syncTglRecv = li.str;
maxSeg = li.leds.maxseg; maxSeg = li.leds.maxseg;
pmt = li.fs.pmt; pmt = li.fs.pmt;
cct = li.leds.cct;
} }
function loadInfo(callback=null) function loadInfo(callback=null)
@ -601,7 +604,6 @@ function loadInfo(callback=null)
parseInfo(); parseInfo();
showNodes(); showNodes();
if (isInfo) populateInfo(json); if (isInfo) populateInfo(json);
updateUI();
reqsLegal = true; reqsLegal = true;
if (!ws && lastinfo.ws > -1) setTimeout(makeWS,500); if (!ws && lastinfo.ws > -1) setTimeout(makeWS,500);
}) })
@ -611,6 +613,7 @@ function loadInfo(callback=null)
}) })
.finally(()=>{ .finally(()=>{
if (callback) callback(); if (callback) callback();
updateUI();
}); });
} }
@ -1041,7 +1044,7 @@ function updateUI()
updateTrail(gId('sliderC3')); updateTrail(gId('sliderC3'));
gId('wwrap').style.display = (isRgbw) ? "block":"none"; gId('wwrap').style.display = (isRgbw) ? "block":"none";
gId("wbal").style.display = (lastinfo.leds.cct) ? "block":"none"; gId("wbal").style.display = (cct) ? "block":"none";
updatePA(); updatePA();
updateHex(); updateHex();
@ -1066,7 +1069,6 @@ function updateSelectedFx()
var parent = gId('fxlist'); var parent = gId('fxlist');
var selEffectInput = parent.querySelector(`input[name="fx"][value="${selectedFx}"]`); var selEffectInput = parent.querySelector(`input[name="fx"][value="${selectedFx}"]`);
if (selEffectInput) selEffectInput.checked = true; if (selEffectInput) selEffectInput.checked = true;
console.log(selEffectInput);
var selElement = parent.querySelector('.selected'); var selElement = parent.querySelector('.selected');
if (selElement) selElement.classList.remove('selected'); if (selElement) selElement.classList.remove('selected');

1797
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2111121 #define VERSION 2111151
//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