Merge branch 'mapping12soundsim' into live-merge
This commit is contained in:
Blaz Kristan
commit
5dec73f27c
@ -393,6 +393,12 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
|
|||||||
method: "gzip",
|
method: "gzip",
|
||||||
filter: "html-minify",
|
filter: "html-minify",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
file: "liveviewws2D.htm",
|
||||||
|
name: "PAGE_liveviewws2D",
|
||||||
|
method: "gzip",
|
||||||
|
filter: "html-minify",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
file: "404.htm",
|
file: "404.htm",
|
||||||
name: "PAGE_404",
|
name: "PAGE_404",
|
||||||
|
|||||||
@ -233,6 +233,14 @@ button {
|
|||||||
border: 0px;
|
border: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#liveview2D {
|
||||||
|
height: 90%;
|
||||||
|
display: none;
|
||||||
|
width: 90%;
|
||||||
|
border: 0px;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
.tab {
|
.tab {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
color: var(--c-d);
|
color: var(--c-d);
|
||||||
|
|||||||
@ -351,6 +351,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="mliveview2D" class="modal">
|
||||||
|
<div id="kliveview2D" style="width:100%; height:100%">Loading...</div><br>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div id="rover" class="modal">
|
<div id="rover" class="modal">
|
||||||
<i class="icons huge"></i><br>
|
<i class="icons huge"></i><br>
|
||||||
<div id="lv">?</div><br><br>
|
<div id="lv">?</div><br><br>
|
||||||
|
|||||||
@ -621,19 +621,6 @@ function parseInfo(i) {
|
|||||||
//}
|
//}
|
||||||
//setInnerHTML(obj, html);
|
//setInnerHTML(obj, html);
|
||||||
|
|
||||||
//https://stackoverflow.com/questions/2592092/executing-script-elements-inserted-with-innerhtml
|
|
||||||
//var setInnerHTML = function(elm, html) {
|
|
||||||
// elm.innerHTML = html;
|
|
||||||
// Array.from(elm.querySelectorAll("script")).forEach( oldScript => {
|
|
||||||
// const newScript = document.createElement("script");
|
|
||||||
// Array.from(oldScript.attributes)
|
|
||||||
// .forEach( attr => newScript.setAttribute(attr.name, attr.value) );
|
|
||||||
// newScript.appendChild(document.createTextNode(oldScript.innerHTML));
|
|
||||||
// oldScript.parentNode.replaceChild(newScript, oldScript);
|
|
||||||
// });
|
|
||||||
//}
|
|
||||||
//setInnerHTML(obj, html);
|
|
||||||
|
|
||||||
function populateInfo(i)
|
function populateInfo(i)
|
||||||
{
|
{
|
||||||
var cn="";
|
var cn="";
|
||||||
@ -1546,18 +1533,34 @@ function toggleSync()
|
|||||||
|
|
||||||
function toggleLiveview()
|
function toggleLiveview()
|
||||||
{
|
{
|
||||||
isLv = !isLv;
|
//WLEDSR adding liveview2D support
|
||||||
gId('liveview').style.display = (isLv) ? "block":"none";
|
if (isInfo && isM) toggleInfo();
|
||||||
var url = (loc?`http://${locip}`:'') + "/liveview";
|
if (isNodes && isM) toggleNodes();
|
||||||
gId('liveview').src = (isLv) ? url:"about:blank";
|
isLv = !isLv;
|
||||||
gId('buttonSr').className = (isLv) ? "active":"";
|
|
||||||
if (!isLv && ws && ws.readyState === WebSocket.OPEN) ws.send('{"lv":false}');
|
var lvID = "liveview";
|
||||||
size();
|
if (isM) {
|
||||||
|
lvID = "liveview2D"
|
||||||
|
if (isLv) {
|
||||||
|
var cn = '<iframe id="liveview2D" src="about:blank"></iframe>';
|
||||||
|
d.getElementById('kliveview2D').innerHTML = cn;
|
||||||
|
}
|
||||||
|
|
||||||
|
gId('mliveview2D').style.transform = (isLv) ? "translateY(0px)":"translateY(100%)";
|
||||||
|
}
|
||||||
|
|
||||||
|
gId(lvID).style.display = (isLv) ? "block":"none";
|
||||||
|
var url = (loc?`http://${locip}`:'') + "/" + lvID;
|
||||||
|
gId(lvID).src = (isLv) ? url:"about:blank";
|
||||||
|
gId('buttonSr').className = (isLv) ? "active":"";
|
||||||
|
if (!isLv && ws && ws.readyState === WebSocket.OPEN) ws.send('{"lv":false}');
|
||||||
|
size();
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleInfo()
|
function toggleInfo()
|
||||||
{
|
{
|
||||||
if (isNodes) toggleNodes();
|
if (isNodes) toggleNodes();
|
||||||
|
if (isLv && isM) toggleLiveview();
|
||||||
isInfo = !isInfo;
|
isInfo = !isInfo;
|
||||||
if (isInfo) requestJson();
|
if (isInfo) requestJson();
|
||||||
gId('info').style.transform = (isInfo) ? "translateY(0px)":"translateY(100%)";
|
gId('info').style.transform = (isInfo) ? "translateY(0px)":"translateY(100%)";
|
||||||
@ -1567,6 +1570,7 @@ function toggleInfo()
|
|||||||
function toggleNodes()
|
function toggleNodes()
|
||||||
{
|
{
|
||||||
if (isInfo) toggleInfo();
|
if (isInfo) toggleInfo();
|
||||||
|
if (isLv && isM) toggleLiveview();
|
||||||
isNodes = !isNodes;
|
isNodes = !isNodes;
|
||||||
if (isNodes) loadNodes();
|
if (isNodes) loadNodes();
|
||||||
gId('nodes').style.transform = (isNodes) ? "translateY(0px)":"translateY(100%)";
|
gId('nodes').style.transform = (isNodes) ? "translateY(0px)":"translateY(100%)";
|
||||||
|
|||||||
113
wled00/data/liveviewws2D.htm
Normal file
113
wled00/data/liveviewws2D.htm
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="theme-color" content="#222222">
|
||||||
|
<title>WLED Live Preview</title>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<canvas id="liveviewCanvas">
|
||||||
|
LiveView
|
||||||
|
</canvas>
|
||||||
|
<script>
|
||||||
|
var canvas = document.getElementById('liveviewCanvas');
|
||||||
|
canvas.width = window.innerWidth * 0.98; //remove scroll bars
|
||||||
|
canvas.height = window.innerHeight * 0.98; //remove scroll bars
|
||||||
|
var leds = "";
|
||||||
|
var matrixWidth = 0;
|
||||||
|
var pixelsPerLed = 0;
|
||||||
|
// Check for canvas support
|
||||||
|
if (canvas.getContext) {
|
||||||
|
// Access the rendering context
|
||||||
|
var ctx = canvas.getContext('2d');
|
||||||
|
|
||||||
|
//In case of pixels
|
||||||
|
|
||||||
|
// // ImageData object
|
||||||
|
// var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
|
||||||
|
// // One-dimensional array containing the data in the RGBA order
|
||||||
|
// var data = imageData.data;
|
||||||
|
|
||||||
|
// function drawLedPixels(x, y, r, g, b, a) { //old
|
||||||
|
// // console.log(x, y, r, g, b, a);
|
||||||
|
// for (right = 0; right < pixelsPerLed; right++) {
|
||||||
|
// for (down = 0; down < pixelsPerLed; down++) {
|
||||||
|
// ff = (x * pixelsPerLed + right + (y * pixelsPerLed + down) * matrixWidth * pixelsPerLed) * 4;
|
||||||
|
// // if (x==15 && y==15)
|
||||||
|
// // console.log("ff=" + x + " * " + pixelsPerLed + " +" + right + " + (" + y + " * " + pixelsPerLed + " +" + down + ") * " + matrixWidth + ") * 4 = " + ff, data.length); //(5*10+1 + (12*10+1) * 16) * 4 = (51 + 121*16) * 4
|
||||||
|
// data[ff + 0] = r;
|
||||||
|
// data[ff + 1] = g;
|
||||||
|
// data[ff + 2] = b;
|
||||||
|
// data[ff + 3] = a;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
function drawLedCircles(x, y, r, g, b, a) {
|
||||||
|
ctx.fillStyle = `rgb(${r},${g},${b})`;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.arc(x*pixelsPerLed+pixelsPerLed*0.5, y*pixelsPerLed+pixelsPerLed*0.5, pixelsPerLed*0.4, 0, 2 * Math.PI);
|
||||||
|
ctx.fill();
|
||||||
|
}
|
||||||
|
|
||||||
|
function paintLeds() {
|
||||||
|
// data represents the Uint8ClampedArray containing the data
|
||||||
|
// in the RGBA order [r0, g0, b0, a0, r1, g1, b1, a1, ..., rn, gn, bn, an]
|
||||||
|
|
||||||
|
for (i = 4; i < leds.length; i+=3) {
|
||||||
|
let ff = (i-4)/3;
|
||||||
|
drawLedCircles(ff%matrixWidth, Math.floor(ff/matrixWidth), leds[i], leds[i+1], leds[i+2], 255)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ctx.putImageData(imageData, 0, 0); //in case of drawLedPixels
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function updatePreview(ledsp) {
|
||||||
|
leds = ledsp;
|
||||||
|
matrixWidth = leds[2];
|
||||||
|
matrixHeight = leds[3];
|
||||||
|
pixelsPerLed = Math.min(canvas.width / matrixWidth, canvas.height / matrixHeight);
|
||||||
|
// console.log(canvas.width, matrixWidth, canvas.height, matrixHeight, pixelsPerLed, leds);
|
||||||
|
paintLeds();
|
||||||
|
}
|
||||||
|
|
||||||
|
function getLiveJson(e) {
|
||||||
|
try {
|
||||||
|
if (toString.call(e.data) === '[object ArrayBuffer]') {
|
||||||
|
let leds = new Uint8Array(event.data);
|
||||||
|
if (leds[0] != 76) return; //'L', set in ws.cpp
|
||||||
|
updatePreview(leds);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (err) {
|
||||||
|
console.error("Peek WS error:",err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var ws;
|
||||||
|
try {
|
||||||
|
ws = top.window.ws;
|
||||||
|
} catch (e) {}
|
||||||
|
if (ws && ws.readyState === WebSocket.OPEN) {
|
||||||
|
console.info("Peek uses top WS");
|
||||||
|
ws.send("{'lv':true}");
|
||||||
|
} else {
|
||||||
|
console.info("Peek WS opening");
|
||||||
|
ws = new WebSocket((window.location.protocol == "https:"?"wss":"ws")+"://"+document.location.host+"/ws");
|
||||||
|
ws.onopen = function () {
|
||||||
|
console.info("Peek WS open");
|
||||||
|
ws.send("{'lv':true}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ws.binaryType = "arraybuffer";
|
||||||
|
ws.addEventListener('message',getLiveJson);
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -281,6 +281,68 @@ const uint8_t PAGE_liveviewws[] PROGMEM = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// Autogenerated from wled00/data/liveviewws2D.htm, do not edit!!
|
||||||
|
const uint16_t PAGE_liveviewws2D_length = 896;
|
||||||
|
const uint8_t PAGE_liveviewws2D[] PROGMEM = {
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x7d, 0x55, 0x6d, 0x6f, 0xdb, 0x36,
|
||||||
|
0x10, 0xfe, 0xee, 0x5f, 0xa1, 0x72, 0x5d, 0x4b, 0xc6, 0x8a, 0xe4, 0x3a, 0xc9, 0x96, 0xd9, 0x92,
|
||||||
|
0x8b, 0x35, 0x35, 0xb0, 0x0e, 0xd9, 0x6a, 0xc0, 0xdd, 0x82, 0x21, 0x30, 0x50, 0x5a, 0x3a, 0x5b,
|
||||||
|
0x5c, 0x25, 0x52, 0x20, 0x69, 0x2b, 0x86, 0xa0, 0xff, 0xbe, 0xa3, 0xe4, 0x38, 0x76, 0xb2, 0xcd,
|
||||||
|
0x1f, 0x24, 0x91, 0x77, 0x7c, 0xee, 0xe1, 0x73, 0x2f, 0x8e, 0x5e, 0x7d, 0xfc, 0x7c, 0xf3, 0xe5,
|
||||||
|
0xaf, 0xd9, 0xd4, 0xcb, 0x6c, 0x91, 0x4f, 0xa2, 0xfd, 0x13, 0x78, 0x3a, 0x89, 0x0a, 0xb0, 0xdc,
|
||||||
|
0x93, 0xbc, 0x80, 0x98, 0x6c, 0x05, 0x54, 0xa5, 0xd2, 0x96, 0x78, 0xbd, 0x44, 0x49, 0x0b, 0xd2,
|
||||||
|
0xc6, 0xa4, 0x12, 0xa9, 0xcd, 0xe2, 0x14, 0xb6, 0x22, 0x81, 0xf3, 0x76, 0xe1, 0x0b, 0x29, 0xac,
|
||||||
|
0xe0, 0xf9, 0xb9, 0x49, 0x78, 0x0e, 0xf1, 0x3b, 0xbf, 0xc0, 0x8d, 0x62, 0x53, 0x3c, 0xae, 0xc9,
|
||||||
|
0x1e, 0xb3, 0x97, 0x64, 0x5c, 0x1b, 0x40, 0x8c, 0x8d, 0x5d, 0x9d, 0x5f, 0x93, 0x93, 0x50, 0x36,
|
||||||
|
0x83, 0x02, 0xce, 0x13, 0x95, 0x2b, 0x4d, 0xbc, 0x43, 0xb0, 0xef, 0x86, 0xed, 0x0f, 0x5d, 0xad,
|
||||||
|
0xb0, 0x39, 0x4c, 0x7a, 0x77, 0xb7, 0xd3, 0x8f, 0xde, 0xad, 0xd8, 0x82, 0x37, 0xd3, 0xe0, 0xe8,
|
||||||
|
0x45, 0x61, 0x67, 0x89, 0x8c, 0xdd, 0xe1, 0x6b, 0xa9, 0xd2, 0x5d, 0x5d, 0x70, 0xbd, 0x16, 0x72,
|
||||||
|
0x34, 0x68, 0xa2, 0xb0, 0xdb, 0x8d, 0xc2, 0xee, 0x6a, 0xce, 0x3a, 0x89, 0x12, 0x2e, 0xb7, 0xdc,
|
||||||
|
0x78, 0x3d, 0x91, 0xc6, 0x24, 0x47, 0x28, 0x07, 0x73, 0xd3, 0xee, 0x91, 0x89, 0x83, 0xfe, 0xb3,
|
||||||
|
0x85, 0xed, 0xbc, 0x10, 0x37, 0xd1, 0xa2, 0xb4, 0x93, 0xde, 0x96, 0x6b, 0xaf, 0xdb, 0x8b, 0x53,
|
||||||
|
0x95, 0x6c, 0x0a, 0xe4, 0x17, 0xac, 0xc1, 0x4e, 0x73, 0x70, 0x9f, 0x1f, 0x76, 0x9f, 0x52, 0xfa,
|
||||||
|
0x1c, 0x8d, 0x8d, 0xbb, 0x03, 0x41, 0xa7, 0x59, 0xf0, 0xd3, 0xf5, 0x59, 0x25, 0x64, 0xaa, 0xaa,
|
||||||
|
0x40, 0x48, 0x09, 0xfa, 0xae, 0x15, 0x6f, 0xef, 0x92, 0x81, 0x58, 0x67, 0xf6, 0x85, 0xcf, 0x2f,
|
||||||
|
0xed, 0xf6, 0xd8, 0x05, 0xaf, 0x8c, 0x9f, 0x43, 0x6a, 0x62, 0x42, 0xfc, 0x82, 0x5b, 0x2d, 0x1e,
|
||||||
|
0xda, 0xf3, 0xf1, 0xc0, 0x2f, 0xc5, 0x03, 0xe4, 0x66, 0x06, 0xfa, 0x16, 0xd2, 0x78, 0x30, 0x16,
|
||||||
|
0x2b, 0xba, 0xc7, 0x44, 0x7a, 0x37, 0x4e, 0xc9, 0x07, 0xcb, 0xea, 0x96, 0xbe, 0x7d, 0x88, 0x5f,
|
||||||
|
0x98, 0x28, 0x19, 0xa6, 0xc8, 0x74, 0xb5, 0x91, 0x89, 0x15, 0x4a, 0x7a, 0xa9, 0xe6, 0x15, 0x02,
|
||||||
|
0xdd, 0x08, 0x9d, 0xe4, 0x60, 0x28, 0xf8, 0xd6, 0x17, 0xbe, 0xf4, 0xb9, 0x6f, 0x58, 0x8d, 0x00,
|
||||||
|
0xc1, 0x4a, 0xe4, 0xf9, 0xdc, 0xa9, 0x1a, 0x7f, 0xd5, 0xeb, 0x25, 0x7d, 0x5d, 0x8b, 0xc6, 0x7f,
|
||||||
|
0x5d, 0x4b, 0xf7, 0xe0, 0x0d, 0xfb, 0xea, 0x3b, 0x9f, 0x25, 0xa0, 0xfe, 0x33, 0x6e, 0x33, 0xca,
|
||||||
|
0xda, 0x35, 0xd7, 0x09, 0x85, 0xb3, 0x63, 0x9e, 0xfd, 0xe0, 0xea, 0x64, 0xed, 0xdb, 0xff, 0x37,
|
||||||
|
0x07, 0x97, 0xa7, 0xeb, 0x81, 0x3f, 0x3c, 0xfb, 0x0d, 0x03, 0x04, 0xb3, 0x4f, 0x5d, 0x08, 0x47,
|
||||||
|
0x8b, 0xb2, 0xe6, 0x70, 0x8d, 0x92, 0x0b, 0x69, 0xd1, 0xd3, 0x50, 0x56, 0xaf, 0x94, 0xa6, 0x22,
|
||||||
|
0xbe, 0x1c, 0x8b, 0xc8, 0x09, 0x18, 0xe4, 0x20, 0xd7, 0x36, 0x1b, 0x8b, 0x7e, 0x7c, 0xc1, 0xea,
|
||||||
|
0x1c, 0xac, 0x07, 0x31, 0x15, 0xe7, 0x97, 0x2c, 0xbc, 0x18, 0x3f, 0xbf, 0xfc, 0xf7, 0x47, 0x4a,
|
||||||
|
0xfb, 0x6d, 0xbc, 0x55, 0xae, 0x10, 0x0d, 0xc2, 0x23, 0x03, 0x6b, 0xf3, 0x72, 0x2f, 0x16, 0xfb,
|
||||||
|
0x77, 0xff, 0xdd, 0xe1, 0x6b, 0xb8, 0xf0, 0x87, 0x57, 0x57, 0xac, 0x69, 0x9e, 0x88, 0x6d, 0xca,
|
||||||
|
0x94, 0x5b, 0xd8, 0x57, 0x2f, 0x05, 0x56, 0x1f, 0x27, 0x93, 0xb6, 0x19, 0x06, 0x76, 0x8f, 0x07,
|
||||||
|
0xbb, 0xfd, 0xae, 0x00, 0xe2, 0x16, 0xef, 0x62, 0x71, 0x9a, 0xeb, 0x96, 0x10, 0x36, 0x1b, 0x3d,
|
||||||
|
0x2e, 0xb3, 0x63, 0x66, 0xa7, 0xc5, 0x15, 0x1e, 0x23, 0x32, 0xff, 0x48, 0xa1, 0x27, 0x76, 0x58,
|
||||||
|
0x17, 0xae, 0x05, 0x7e, 0x35, 0x4a, 0x3a, 0x6e, 0x56, 0xef, 0x6a, 0xac, 0x27, 0x72, 0xaf, 0x96,
|
||||||
|
0x7f, 0x43, 0x62, 0xbd, 0x9f, 0xb5, 0xe6, 0xbb, 0x0f, 0x9b, 0xd5, 0x0a, 0xf4, 0x82, 0xc4, 0x71,
|
||||||
|
0x6c, 0xd5, 0x1c, 0x21, 0xe5, 0x3a, 0xc0, 0x4e, 0xcf, 0x29, 0x04, 0x78, 0x35, 0xce, 0x1e, 0x45,
|
||||||
|
0x95, 0x50, 0x79, 0x7f, 0x60, 0x8c, 0xeb, 0xf6, 0x14, 0x85, 0xad, 0x6b, 0x99, 0xd6, 0xc3, 0xd5,
|
||||||
|
0xe8, 0x8f, 0x3f, 0xbc, 0x8a, 0xe1, 0x7e, 0xb0, 0x60, 0x1a, 0xec, 0x46, 0xcb, 0xf1, 0x73, 0x5d,
|
||||||
|
0x9a, 0x26, 0xe1, 0x36, 0xc9, 0x1c, 0x0b, 0x1c, 0x07, 0x46, 0xe5, 0x10, 0x80, 0xd6, 0xa8, 0x3d,
|
||||||
|
0x99, 0x01, 0x7c, 0xf3, 0xee, 0xe6, 0x5e, 0xbb, 0x1c, 0x11, 0xdf, 0xf9, 0x3a, 0xa2, 0x95, 0x41,
|
||||||
|
0x3e, 0x65, 0xb0, 0x6f, 0x9f, 0xca, 0x3c, 0x01, 0x34, 0x95, 0x79, 0xf3, 0xa6, 0x32, 0x81, 0xc6,
|
||||||
|
0x29, 0xb0, 0x9b, 0x5b, 0x8c, 0x83, 0xdc, 0xef, 0x60, 0x39, 0x57, 0xc9, 0x37, 0xb0, 0xc1, 0xe7,
|
||||||
|
0xd9, 0xf4, 0xf7, 0xf7, 0xf4, 0x31, 0x8a, 0x90, 0x2b, 0xb5, 0x0f, 0xb2, 0x31, 0x60, 0x3c, 0xc4,
|
||||||
|
0xc4, 0x68, 0x84, 0xf9, 0x08, 0x60, 0x40, 0x62, 0x9b, 0xd7, 0x6f, 0xf3, 0xed, 0xdb, 0x91, 0xd5,
|
||||||
|
0x1b, 0x68, 0x08, 0x63, 0xa3, 0x7f, 0x3b, 0x89, 0xf4, 0x54, 0x09, 0x12, 0xa5, 0xc1, 0x83, 0x14,
|
||||||
|
0x99, 0x39, 0x31, 0x0e, 0x11, 0x29, 0x25, 0x99, 0xb5, 0xa5, 0x19, 0xa1, 0x86, 0x7b, 0xba, 0xb9,
|
||||||
|
0x42, 0xb6, 0x98, 0x81, 0xa0, 0xd4, 0xca, 0x2a, 0x9c, 0x83, 0xef, 0x49, 0x65, 0x0c, 0x19, 0xe1,
|
||||||
|
0x93, 0xb0, 0x3e, 0x19, 0x85, 0x21, 0xe9, 0x1f, 0xe6, 0xce, 0xc1, 0x39, 0x53, 0xc6, 0xf6, 0x49,
|
||||||
|
0xe8, 0x7c, 0x58, 0xa0, 0xa4, 0x0b, 0x19, 0x3f, 0xe6, 0x92, 0x3e, 0x09, 0xf7, 0x92, 0xd8, 0x7f,
|
||||||
|
0x5e, 0xa7, 0x69, 0x0d, 0x4b, 0x21, 0xb9, 0xde, 0x7d, 0xd9, 0x95, 0x38, 0x99, 0xb9, 0xcb, 0xde,
|
||||||
|
0xb2, 0xcd, 0x39, 0x71, 0x36, 0x9e, 0xa6, 0x53, 0x97, 0xca, 0x5b, 0x61, 0x70, 0x48, 0x03, 0x26,
|
||||||
|
0xa4, 0x00, 0x63, 0xf8, 0x1a, 0x88, 0x7f, 0x54, 0x3d, 0xac, 0x87, 0xc3, 0xb7, 0x1b, 0x9d, 0x51,
|
||||||
|
0xd8, 0xcd, 0xdd, 0xb0, 0xfd, 0x97, 0xf9, 0x07, 0xa8, 0x98, 0x44, 0x5c, 0x7b, 0x06, 0x00, 0x00
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// Autogenerated from wled00/data/404.htm, do not edit!!
|
// Autogenerated from wled00/data/404.htm, do not edit!!
|
||||||
const uint16_t PAGE_404_length = 868;
|
const uint16_t PAGE_404_length = 868;
|
||||||
const uint8_t PAGE_404[] PROGMEM = {
|
const uint8_t PAGE_404[] PROGMEM = {
|
||||||
|
|||||||
3666
wled00/html_ui.h
3666
wled00/html_ui.h
File diff suppressed because it is too large
Load Diff
@ -103,6 +103,14 @@ void initServer()
|
|||||||
request->send(response);
|
request->send(response);
|
||||||
//request->send_P(200, "text/html", PAGE_liveviewws);
|
//request->send_P(200, "text/html", PAGE_liveviewws);
|
||||||
});
|
});
|
||||||
|
server.on("/liveview2D", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
|
if (handleIfNoneMatchCacheHeader(request)) return;
|
||||||
|
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_liveviewws2D, PAGE_liveviewws2D_length);
|
||||||
|
response->addHeader(FPSTR(s_content_enc),"gzip");
|
||||||
|
setStaticContentCacheHeaders(response);
|
||||||
|
request->send(response);
|
||||||
|
//request->send_P(200, "text/html", PAGE_liveviewws);
|
||||||
|
});
|
||||||
#else
|
#else
|
||||||
server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
if (handleIfNoneMatchCacheHeader(request)) return;
|
if (handleIfNoneMatchCacheHeader(request)) return;
|
||||||
|
|||||||
@ -138,7 +138,7 @@ void sendDataWs(AsyncWebSocketClient * client)
|
|||||||
releaseJSONBufferLock();
|
releaseJSONBufferLock();
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAX_LIVE_LEDS_WS 256
|
#define MAX_LIVE_LEDS_WS 1024
|
||||||
|
|
||||||
bool sendLiveLedsWs(uint32_t wsClient)
|
bool sendLiveLedsWs(uint32_t wsClient)
|
||||||
{
|
{
|
||||||
@ -153,8 +153,10 @@ bool sendLiveLedsWs(uint32_t wsClient)
|
|||||||
uint8_t* buffer = wsBuf->get();
|
uint8_t* buffer = wsBuf->get();
|
||||||
buffer[0] = 'L';
|
buffer[0] = 'L';
|
||||||
buffer[1] = 1; //version
|
buffer[1] = 1; //version
|
||||||
|
buffer[2] = strip.matrixWidth;
|
||||||
|
buffer[3] = strip.matrixHeight;
|
||||||
|
|
||||||
uint16_t pos = 2;
|
uint16_t pos = 4;
|
||||||
for (uint16_t i= 0; pos < bufSize -2; i += n)
|
for (uint16_t i= 0; pos < bufSize -2; i += n)
|
||||||
{
|
{
|
||||||
uint32_t c = strip.getPixelColor(i);
|
uint32_t c = strip.getPixelColor(i);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user