Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'MoonModules:mdev' into DMX-Input-esp_dmx

Browse Source
This commit is contained in:
netmindz
2023-03-30 19:05:19 +01:00
committed by GitHub
parent dc089f6227 e8d3712d4f
commit d64cbc9059
15 changed files with 1729 additions and 1682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/data/index.htm
View File

@@ -52,7 +52,7 @@
setTimeout(()=>{h.appendChild(l)},100);
</script>
<link rel="stylesheet" href="index.css">
<link rel="stylesheet" href="../../usermods/customeffects/customeffects.css"> <!--WLEDMM Custom Effects -->
<link rel="stylesheet" href="../../usermods/artifx/artifx.css"> <!--WLEDMM ARTIFX -->
</head>
<body>
@@ -66,7 +66,7 @@
<button id="buttonPower" onclick="togglePower()" class="tgl"><i class="icons">&#xe08f;</i><p class="tab-label">Power</p></button>
<button id="buttonNl" onclick="toggleNl()"><i class="icons">&#xe2a2;</i><p class="tab-label">Timer</p></button>
<button id="buttonSync" onclick="toggleSync()"><i class="icons">&#xe116;</i><p class="tab-label">Sync</p></button>
<button id="buttonSr" onclick="toggleLiveview()"><i class="icons">&#xe410;</i><p class="tab-label">GFX ☾</p></button>
<button id="buttonSr" onclick="toggleLiveview()"><i class="icons">&#xe410;</i><p class="tab-label">GFX</p></button>
<button id="buttonI" onclick="toggleInfo()"><i class="icons">&#xe066;</i><p class="tab-label">Info</p></button>
<button id="buttonNodes" onclick="toggleNodes()"><i class="icons">&#xe22d;</i><p class="tab-label">Nodes</p></button>
<button onclick="window.location.href='/settings';"><i class="icons">&#xe0a2;</i><p class="tab-label">Config</p></button>
@@ -210,7 +210,7 @@
<div id="effectGFX"> <!--WLEDMM-->
<!-- <p class="labels hd">Peek ☾ <button class="btn infobtn btn-xs" onclick="eandp(this,gId('canvasPeek'));">v</button></p> -->
<br>
<canvas id="canvasPeek"></canvas><br>
<canvas id="canvasPeek" onclick="bigPeek(true)"></canvas><br>
<br>
</div>
<div id="fx">
@@ -393,7 +393,7 @@
</div>
</div>
<!-- WLEDMM Custom Effects -->
<!-- WLEDMM ARTIFX -->
<div id="ceEditor" class="modal">
<div id="kceEditor">Loading...</div><br>
</div>
@@ -413,6 +413,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> <!--WLEDMM Custom Effects-->
<script src="../../usermods/artifx/artifx.js"></script> <!--WLEDMM ARTIFX-->
</body>
</html>

22
wled00/data/index.js
View File

@@ -771,9 +771,9 @@ function populateSegments(s)
<option value="3" ${inst.si==3?' selected':''}>U14_3</option>
</select></div>
</div>`;
//WLEDMM Custom Effects
//WLEDMM ARTIFX
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>`;
let cusEff = `<button class="btn" onclick="toggleCEEditor('${inst.n?inst.n:"default"}', ${i})">ARTI-FX Editor ☾</button><br>`;
cn += `<div class="seg lstI ${i==s.mainseg ? 'selected' : ''} ${exp ? "expanded":""}" id="seg${i}">
<label class="check schkl">
<input type="checkbox" id="seg${i}sel" onchange="selSeg(${i})" ${inst.sel ? "checked":""}>
@@ -821,7 +821,7 @@ function populateSegments(s)
${!(isM&&staX<mw*mh)?rvXck:''}
${isM&&staX<mw*mh&&stoY-staY>1&&stoX-staX>1?map2D:''}
${s.AudioReactive && s.AudioReactive.on ? "" : sndSim}
${s.CustomEffects && s.CustomEffects.on && fxName.includes("Custom Effect") ? cusEff : ""}
${s.ARTIFX && s.ARTIFX.on && fxName.includes("ARTI-FX") ? cusEff : ""}
<label class="check revchkl" id="seg${i}lbtm">
${isM&&staX<mw*mh?'Transpose':'Mirror effect'}${isM&&staX<mw*mh?
'<input type="checkbox" id="seg'+i+'tp" onchange="setTp('+i+')" '+(inst.tp?"checked":"")+'>':
@@ -1963,6 +1963,22 @@ function toggleLiveview()
if (ws && ws.readyState === WebSocket.OPEN) ws.send(`{"lv":${isLv}}`);
}
//WLEDMM create and delete iFrame for peek (isLv is true if create)
function bigPeek(doCreate)
{
let lvID = "liveview2D"
if (doCreate) {
var cn = '<iframe id="liveview2D" src="about:blank" onload="this.contentWindow.document.body.onclick=function(){bigPeek(false);}"></iframe>';
gId('kliveview2D').innerHTML = cn;
}
gId('mliveview2D').style.transform = (doCreate) ? "translateY(0px)":"translateY(100%)";
gId(lvID).style.display = (doCreate) ? "block":"none";
var url = (loc?`http://${locip}`:'') + "/" + lvID;
gId(lvID).src = (doCreate) ? url:"about:blank";
}
function toggleInfo()
{
if (isNodes) toggleNodes();