Change WLEDSR to WLEDMM in comments

This commit is contained in:
Ewoud
2022-11-09 12:14:42 +01:00
parent f2adc5eff4
commit c3c3ff39b5
24 changed files with 98 additions and 98 deletions

View File

@@ -51,7 +51,7 @@
setTimeout(()=>{h.appendChild(l)},100);
</script>
<link rel="stylesheet" href="index.css">
<link rel="stylesheet" href="../../usermods/customeffects/customeffects.css"> <!--WLEDSR Custom Effects -->
<link rel="stylesheet" href="../../usermods/customeffects/customeffects.css"> <!--WLEDMM Custom Effects -->
</head>
<body>
@@ -366,7 +366,7 @@
</div>
</div>
<!-- WLEDSR Custom Effects -->
<!-- WLEDMM Custom Effects -->
<div id="ceEditor" class="modal">
<div id="kceEditor">Loading...</div><br>
</div>
@@ -386,6 +386,6 @@
</div>
<i id="roverstar" class="icons huge" onclick="setLor(0)">&#xe410;</i><br>
<script src="index.js"></script>
<script src="../../usermods/customeffects/customeffects.js"></script> <!--WLEDSR Custom Effects-->
<script src="../../usermods/customeffects/customeffects.js"></script> <!--WLEDMM Custom Effects-->
</body>
</html>

View File

@@ -642,7 +642,7 @@ function populateInfo(i)
var cn="";
var heap = i.freeheap/1000;
heap = heap.toFixed(1);
var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDSR - total heap is not available on 8266
var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDMM - total heap is not available on 8266
var pwr = i.leds.pwr;
var pwru = "Not calculated";
if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";}
@@ -661,7 +661,7 @@ function populateInfo(i)
if (i.ver.includes("-bl")) vcn = "Supāku";
if (i.cn) vcn = i.cn;
//WLEDSR: add total heap and total PSRAM, and build number, add bin name
//WLEDMM: add total heap and total PSRAM, and build number, add bin name
if (i.ver.includes(".14.1-")) vcn = "Sitting Ducks"; // easter egg
if ((i.ver.includes("14.0."))&&(i.ver.includes("_MM"))) vcn = "Lupo";
cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p>(WLEDMM_${i.ver}_${i.rel}.bin)</p><p><em>build ${i.vid}</em></p><table>
@@ -672,7 +672,7 @@ ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
${inforow("Uptime",getRuntimeStr(i.uptime))}
${inforow("Estimated current",pwru)}
${inforow("Average FPS",i.leds.fps)}
<!-- WLEDSR begin-->
<!-- WLEDMM begin-->
<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:SeaGreen"></td></tr>
${inforow("MAC address",i.mac)}
${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")}
@@ -688,7 +688,7 @@ ${i.e32model?inforow(i.e32model,i.e32cores +" core(s)"," "+i.e32speed+" Mhz"):""
${i.e32flash?inforow("Flash "+i.e32flash+" MB"+", mode "+i.e32flashmode+i.e32flashtext,i.e32flashspeed," Mhz"):""}
${i.e32core0code?inforow("Core0 rst reason",i.e32core0code, " "+i.e32core0text):""}
${i.e32core1code?inforow("Core1 rst reason",i.e32core1code, " "+i.e32core1text):""}
<!-- WLEDSR end-->
<!-- WLEDMM end-->
</table>`;
gId('kv').innerHTML = cn;
// update all sliders in Info
@@ -732,7 +732,7 @@ function populateSegments(s)
rvYck = `<label class="check revchkl">Reverse<input type="checkbox" id="seg${i}rY" onchange="setRevY(${i})" ${inst.rY?"checked":""}><span class="checkmark"></span></label>`;
miYck = `<label class="check revchkl">Mirror<input type="checkbox" id="seg${i}mY" onchange="setMiY(${i})" ${inst.mY?"checked":""}><span class="checkmark"></span></label>`;
}
// WLEDSR: jMap
// WLEDMM: jMap
let map2D = `<div id="seg${i}map2D" data-map="map2D" class="lbl-s hide">Expand 1D FX<br>
<div class="sel-p"><select class="sel-p" id="seg${i}mp12" onchange="setMp12(${i})">
<option value="0" ${inst.mp12==0?' selected':''}>Pixels</option>
@@ -752,7 +752,7 @@ function populateSegments(s)
<option value="3" ${inst.ssim==3?' selected':''}>U14_3</option>
</select></div>
</div>`;
//WLEDSR Custom Effects
//WLEDMM Custom Effects
let fxName = eJson.find((o)=>{return o.id==selectedFx}).name;
let cusEff = `<button class="btn" onclick="toggleCEEditor('${inst.n?inst.n:"default"}', ${i})">Custom Effect Editor</button><br>`;
cn += `<div class="seg lstI ${i==s.mainseg ? 'selected' : ''} ${exp ? "expanded":""}" id="seg${i}">
@@ -854,7 +854,7 @@ function populateEffects()
});
for (let ef of effects) {
// WLEDSR: add slider and color control to setFX (used by requestjson)
// WLEDMM: add slider and color control to setFX (used by requestjson)
let id = ef.id;
let nm = ef.name+" ";
let fd = "";
@@ -1366,7 +1366,7 @@ function readState(s,command=false)
return true;
}
// WLEDSR: control HTML elements for Slider and Color Control
// WLEDMM: control HTML elements for Slider and Color Control
// Technical notes
// ===============
// If an effect name is followed by an @, slider and color control is effective.
@@ -1623,7 +1623,7 @@ function toggleSync()
function toggleLiveview()
{
//WLEDSR adding liveview2D support
//WLEDMM adding liveview2D support
if (isInfo && isM) toggleInfo();
if (isNodes && isM) toggleNodes();
isLv = !isLv;

View File

@@ -46,10 +46,10 @@
if (leds[0] != 76 || leds[1] != 2 || !ctx) return; //'L', set in ws.cpp
let mW = leds[2]; // matrix width
let mH = leds[3]; // matrix height
let pPL = Math.min(c.width / mW, (c.height-10) / mH); // pixels per LED (width of circle) WLEDSR -10 for prompts
let pPL = Math.min(c.width / mW, (c.height-10) / mH); // pixels per LED (width of circle) WLEDMM -10 for prompts
let lOf = Math.floor((c.width - pPL*mW)/2); //left offeset (to center matrix)
var i = 6;
ctx.clearRect(0, 0, c.width, c.height); //WLEDSR
ctx.clearRect(0, 0, c.width, c.height); //WLEDMM
for (y=0.5;y<mH;y++) for (x=0.5; x<mW; x++) {
ctx.fillStyle = `rgb(${leds[i]},${leds[i+1]},${leds[i+2]})`;
ctx.beginPath();
@@ -57,7 +57,7 @@
ctx.fill();
i+=3;
}
//WLEDSR show preset and playlist id
//WLEDMM show preset and playlist id
ctx.fillStyle = `rgb(255,255,255)`;
if (leds[4] != 0) ctx.fillText("preset " + leds[4].toString(), lOf, mH*pPL+10);
if (leds[5] != 255) ctx.fillText("playlist " + leds[5].toString(), lOf + 70, mH*pPL+10);

View File

@@ -63,7 +63,7 @@
localStorage.setItem('locIp', locip);
}
}
//WLEDSR: add ldS and move loadJS there (like in settings_um)
//WLEDMM: add ldS and move loadJS there (like in settings_um)
ldS();
}
</script>

View File

@@ -55,7 +55,7 @@
}
}
ldS();
if (!numM) gId("um").innerHTML = ""; //WLEDSR: Do not display no usermods installed
if (!numM) gId("um").innerHTML = ""; //WLEDMM: Do not display no usermods installed
}
// https://stackoverflow.com/questions/3885817/how-do-i-check-that-a-number-is-float-or-integer
function isF(n) { return n === +n && n !== (n|0); }
@@ -200,7 +200,7 @@
getPins(json);
urows="";
if (isO(umCfg)) {
//WLEDSR: read url parameter. e.g. um=AudioReactive and if set only add the usermod with the same name
//WLEDMM: read url parameter. e.g. um=AudioReactive and if set only add the usermod with the same name
const queryString = window.location.search;
const urlParams = new URLSearchParams(queryString);
const userMod = urlParams.get('um')
@@ -214,7 +214,7 @@
}
if (userMod != null && urows==="") urows = "Usermods configuration not found.<br>Press <i>Save</i> to initialize defaults.";
}
//WLEDSR: only show globalGPIOs if no usermod info is shown (url without um parameter)
//WLEDMM: only show globalGPIOs if no usermod info is shown (url without um parameter)
gId("globalGPIOs").style.display = urows===""?"block":"none";
gId("um").innerHTML = urows;
@@ -242,7 +242,7 @@
<span id="lssuc" style="color:green; display:none">&#10004; Configuration saved!</span>
<span id="lserr" style="color:red; display:none">&#9888; Could not load configuration.</span>
</div>
<div id="globalGPIOs" style="display:none;"> <!--WLEDSR: show in ldS-->
<div id="globalGPIOs" style="display:none;"> <!--WLEDMM: show in ldS-->
<hr>
<h2>Usermod Setup</h2>
Global I<sup>2</sup>C GPIOs (HW)<br>

View File

@@ -491,7 +491,7 @@ function populateInfo(i)
var cn="";
var heap = i.freeheap/1000;
heap = heap.toFixed(1);
var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDSR - total heap is not available on 8266
var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDMM - total heap is not available on 8266
var pwr = i.leds.pwr;
var pwru = "Not calculated";
if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";}
@@ -510,7 +510,7 @@ function populateInfo(i)
if (i.ver.includes("-bl")) vcn = "Supāku";
if (i.cn) vcn = i.cn;
//WLEDSR: add total heap and total PSRAM, and build number
//WLEDMM: add total heap and total PSRAM, and build number
if (i.ver.includes("14.1-")) vcn = "Sitting Ducks"; // easter egg
if (i.ver.includes("14.0-mdev")) vcn = "Lupo";
cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p><em>build ${i.vid}</em></p><table>
@@ -520,7 +520,7 @@ ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
${inforow("Uptime",getRuntimeStr(i.uptime))}
${inforow("Estimated current",pwru)}
${inforow("Average FPS",i.leds.fps)}
<!-- WLEDSR begin-->
<!-- WLEDMM begin-->
<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:SeaGreen"></td></tr>
${inforow("MAC address",i.mac)}
${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")}
@@ -531,7 +531,7 @@ ${i.tpram?inforow("Total PSRAM",(i.tpram/1024).toFixed(1)," kB"):""}
${i.psusedram?((i.tpram-i.psusedram)>16383?inforow("Max Used PSRAM",((i.tpram-i.psusedram)/1024).toFixed(1)," kB"):inforow("Max Used PSRAM",(i.tpram-i.psusedram)," B")):""}
${i.e32model?inforow(i.e32model,i.e32cores +" core(s)"," "+i.e32speed+" Mhz"):""}
${i.e32flash?inforow("Flash "+i.e32flash+" MB"+", mode "+i.e32flashmode+i.e32flashtext,i.e32flashspeed," Mhz"):""}
<!-- WLEDSR end-->
<!-- WLEDMM end-->
</table>`;
gId('kv').innerHTML = cn;
}
@@ -654,7 +654,7 @@ function populateEffects()
});
for (let i = 0; i < effects.length; i++) {
// WLEDSR: add slider and color control to setEffect (used by requestjson)
// WLEDMM: add slider and color control to setEffect (used by requestjson)
if (effects[i].name.indexOf("RSVD") < 0) {
var posAt = effects[i].name.indexOf("@");
var extra = '';

View File

@@ -16,7 +16,7 @@
<body onload="GetV()">
<h2>MoonMod WLED Software Update</h2>
<form method='POST' action='/update' id='uf' enctype='multipart/form-data' onsubmit="U()">
Installed bin: <span class="sip">##VERSION##</span><br> <!--WLEDSR: show bin name-->
Installed bin: <span class="sip">##VERSION##</span><br> <!--WLEDMM: show bin name-->
Download the latest binary: <a href="https://github.com/MoonModules/WLED/releases" target="_blank">
<img src="https://img.shields.io/github/release/MoonModules/WLED.svg?style=flat-square"></a><br>
<input type='file' name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app-->