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

Fix for default values loaded even with preset.

Browse Source
This commit is contained in:
Blaz Kristan 2021-12-28 21:38:28 +01:00
parent 31603380c1
commit 7cb63b1da0
2 changed files with 1608 additions and 1603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wled00/data/index.js
View File

@ -12,7 +12,7 @@ var selectedFx = 0, prevFx = -1;
var selectedPal = 0; var selectedPal = 0;
var sliderControl = ""; //WLEDSR: used by togglePcMode var sliderControl = ""; //WLEDSR: used by togglePcMode
var csel = 0; var csel = 0;
var currentPreset = -1; var currentPreset = -1, prevPS = -1;
var lastUpdate = 0; var lastUpdate = 0;
var segCount = 0, ledCount = 0, lowestUnused = 0, maxSeg = 0, lSeg = 0; var segCount = 0, ledCount = 0, lowestUnused = 0, maxSeg = 0, lSeg = 0;
var pcMode = false, pcModeA = false, lastw = 0; var pcMode = false, pcModeA = false, lastw = 0;
@ -1044,7 +1044,9 @@ function updateSelectedFx()
var selElement = parent.querySelector('.selected'); var selElement = parent.querySelector('.selected');
if (selElement) { if (selElement) {
if (parseInt(selElement.dataset.id) == prevFx) return; //already selected var fx = (parseInt(selElement.dataset.id) == prevFx) && currentPreset==-1;
var ps = (prevPS != currentPreset) && currentPreset!=-1;
if (fx || ps) return; //already selected
selElement.classList.remove('selected'); selElement.classList.remove('selected');
} }
@ -1118,6 +1120,7 @@ function readState(s,command=false)
nlTar = s.nl.tbri; nlTar = s.nl.tbri;
nlFade = s.nl.fade; nlFade = s.nl.fade;
syncSend = s.udpn.send; syncSend = s.udpn.send;
prevPS = currentPreset;
if (s.pl<0) currentPreset = s.ps; if (s.pl<0) currentPreset = s.ps;
else currentPreset = s.pl; else currentPreset = s.pl;
@ -1327,7 +1330,7 @@ function setSliderAndColorControl(idx)
// if numeric set as selected palette // if numeric set as selected palette
if (paOnOff.length>0 && paOnOff[0]!="" && !isNaN(paOnOff[0]) && parseInt(paOnOff[0])!=selectedPal) obj.seg.pal = parseInt(paOnOff[0]); if (paOnOff.length>0 && paOnOff[0]!="" && !isNaN(paOnOff[0]) && parseInt(paOnOff[0])!=selectedPal) obj.seg.pal = parseInt(paOnOff[0]);
} }
if (!isEmpty(obj.seg)) requestJson(obj); //update default values (may need throttling on ESP8266) if (!isEmpty(obj.seg) && currentPreset==-1) requestJson(obj); //update default values (may need throttling on ESP8266)
} }
var jsonTimeout; var jsonTimeout;

3202
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff