UI/GFX improvements
This commit is contained in:
Ewoud
@@ -1306,26 +1306,26 @@ function drawSegmentView() {
|
||||
|
||||
} // for each segment
|
||||
|
||||
if (gId("segcont").children.length > 0) { //Only show this if more then one segment
|
||||
if (gId("segcont").children.length > 1) { //Only show this if more then one segment
|
||||
gId("MD").innerHTML = "total W*H=LC: " + maxWidth + " x " + maxHeight + " = " + maxWidth * maxHeight;
|
||||
}
|
||||
gId("MD").style.display = gId("segcont").children.length > 0?"inline":"none"
|
||||
gId("MD").style.display = gId("segcont").children.length > 1?"inline":"none"
|
||||
|
||||
function post() {
|
||||
for (let p=0; p<gId("segcont").children.length; p++) {
|
||||
if (!initSegmentVars(p)) break;
|
||||
|
||||
if (gId("segcont").children.length>1) { //only show number if more than one segment
|
||||
if (gId("segcont").children.length>1) { //only show number and name if more than one segment
|
||||
ctx.font = '40px Arial';
|
||||
ctx.fillStyle = "orange";
|
||||
ctx.fillText(p, topLeftX + pw/2*ppL - 10, topLeftY + ph/2*ppL + 10);
|
||||
|
||||
//show name of fx
|
||||
ctx.font = '20px Arial';
|
||||
ctx.fillStyle = "white";
|
||||
var name = eJson.find((o)=>{return o.id==fx}).name;
|
||||
ctx.fillText(name, topLeftX+10, topLeftY + ph*ppL - 10);
|
||||
}
|
||||
|
||||
//show name of fx
|
||||
ctx.font = '20px Arial';
|
||||
ctx.fillStyle = "white";
|
||||
var name = eJson.find((o)=>{return o.id==fx}).name;
|
||||
ctx.fillText(name, topLeftX+10, topLeftY + ph*ppL - 10);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,9 +24,9 @@ function peek(c, setOff=false) {
|
||||
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) WLEDMM -10 for prompts
|
||||
let pPL = Math.min(c.width / mW, c.height / mH); // pixels per LED (width of circle)
|
||||
let lOf = Math.floor((c.width - pPL*mW)/2); //left offeset (to center matrix)
|
||||
var i = 6;
|
||||
var i = 4; //same offset as in ws.cpp
|
||||
ctx.clearRect(0, 0, c.width, c.height); //WLEDMM
|
||||
function colorAmp(color) {
|
||||
if (color == 0) return 0;
|
||||
@@ -39,10 +39,6 @@ function peek(c, setOff=false) {
|
||||
ctx.fill();
|
||||
i+=3;
|
||||
}
|
||||
//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);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Peek WS error:",err);
|
||||
|
||||
@@ -310,49 +310,44 @@ const uint8_t PAGE_liveviewws2D[] PROGMEM = {
|
||||
|
||||
|
||||
// Autogenerated from wled00/data/peek.js, do not edit!!
|
||||
const uint16_t PAGE_peekJs_length = 644;
|
||||
const uint16_t PAGE_peekJs_length = 575;
|
||||
const uint8_t PAGE_peekJs[] PROGMEM = {
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0xdb, 0x6e, 0xdb, 0x30,
|
||||
0x0c, 0xfd, 0x95, 0x54, 0x18, 0x52, 0x29, 0x56, 0x15, 0xc7, 0x6d, 0xda, 0xc1, 0xae, 0x17, 0x6c,
|
||||
0x43, 0x1f, 0x06, 0xec, 0x12, 0x2c, 0x1d, 0xfa, 0x50, 0x04, 0xa8, 0x62, 0xd3, 0x89, 0x57, 0x55,
|
||||
0x0a, 0x64, 0xe5, 0x62, 0xb8, 0xfe, 0xf7, 0x51, 0xb9, 0xac, 0xdd, 0xb0, 0x3d, 0xd8, 0x26, 0xc5,
|
||||
0x73, 0x48, 0x1e, 0x8a, 0x2e, 0x56, 0x3a, 0x73, 0xa5, 0xd1, 0x9d, 0x25, 0xc0, 0x23, 0x75, 0x1c,
|
||||
0xd2, 0x93, 0x01, 0x6b, 0xd6, 0xd2, 0x76, 0x6c, 0xea, 0xc4, 0x1c, 0xdc, 0x47, 0xa3, 0x1d, 0x6c,
|
||||
0x1d, 0x25, 0x51, 0x4e, 0x58, 0x52, 0x16, 0xd4, 0xee, 0xc3, 0x26, 0x71, 0xb6, 0x6e, 0x4c, 0xea,
|
||||
0xcc, 0x52, 0x6c, 0x4a, 0x9d, 0x9b, 0x8d, 0xd8, 0x54, 0x6d, 0x26, 0x5d, 0xb6, 0xa0, 0x8e, 0x35,
|
||||
0x6d, 0x71, 0x4c, 0xac, 0x29, 0xb0, 0xc6, 0x63, 0x91, 0x4b, 0xee, 0xcd, 0xec, 0x27, 0x64, 0xae,
|
||||
0xf3, 0xde, 0x5a, 0x59, 0x7f, 0x58, 0x15, 0x05, 0xd8, 0x29, 0x49, 0x53, 0xcc, 0x32, 0x71, 0xb6,
|
||||
0xd4, 0x73, 0x91, 0x49, 0xa5, 0x28, 0x88, 0x5c, 0x3a, 0xc9, 0x58, 0xa3, 0xc0, 0x75, 0xca, 0x54,
|
||||
0xc3, 0xa6, 0xf3, 0xa3, 0xd4, 0xee, 0xed, 0x8e, 0x75, 0x8c, 0xfa, 0x5e, 0xae, 0x2e, 0x4f, 0xd2,
|
||||
0xf2, 0x3e, 0x9c, 0x3e, 0x3f, 0x47, 0xde, 0x18, 0xa0, 0x71, 0x62, 0x99, 0x05, 0xb7, 0xb2, 0x3a,
|
||||
0xf1, 0x64, 0x89, 0xa7, 0xd1, 0x94, 0x2b, 0xfc, 0x9c, 0x4f, 0x79, 0x96, 0x7e, 0x91, 0x6e, 0x21,
|
||||
0x9e, 0x4a, 0x4d, 0x1d, 0x36, 0x9d, 0xbb, 0x45, 0x5f, 0x72, 0x34, 0x17, 0x50, 0xce, 0x17, 0xee,
|
||||
0x6c, 0x10, 0xb2, 0xbe, 0x62, 0xbc, 0xd8, 0xa3, 0x0a, 0x65, 0x8c, 0xa5, 0x47, 0xe0, 0x59, 0xd6,
|
||||
0x93, 0xac, 0x1f, 0xb1, 0x64, 0xa7, 0x3d, 0xbd, 0x4c, 0x5e, 0xe9, 0x43, 0xb9, 0xfb, 0x92, 0x9d,
|
||||
0x10, 0x95, 0x8c, 0xc2, 0x38, 0x1a, 0x06, 0x51, 0x34, 0xec, 0xb9, 0x7e, 0x34, 0x1c, 0xb6, 0x05,
|
||||
0x66, 0xb1, 0x22, 0x53, 0x20, 0xed, 0x77, 0x94, 0x4e, 0x43, 0x1e, 0xf2, 0x43, 0x52, 0x7e, 0x2c,
|
||||
0xcd, 0x78, 0x9d, 0x8a, 0x61, 0x52, 0x5f, 0xab, 0xa4, 0x0e, 0x02, 0xe6, 0x29, 0x5b, 0x7f, 0xb0,
|
||||
0xbd, 0x96, 0xc9, 0x16, 0x0f, 0xac, 0x28, 0x4a, 0xa5, 0x26, 0xae, 0x56, 0x90, 0x3e, 0xd8, 0xf9,
|
||||
0x8c, 0xbe, 0x69, 0x34, 0x2d, 0xef, 0xcd, 0x94, 0xb5, 0xfc, 0x60, 0x06, 0x83, 0xd7, 0x4e, 0x84,
|
||||
0x0e, 0x7b, 0xe0, 0x56, 0xcc, 0x60, 0x5e, 0xea, 0x31, 0xea, 0xa1, 0x0c, 0x3d, 0x69, 0x33, 0xba,
|
||||
0xed, 0x65, 0x41, 0xc1, 0xeb, 0x5e, 0xc6, 0xc5, 0x05, 0xbe, 0x42, 0x1e, 0xf5, 0x76, 0x7a, 0xc7,
|
||||
0x9f, 0x3c, 0xc2, 0xd7, 0x41, 0xa8, 0x09, 0xd2, 0xf3, 0xe4, 0x75, 0x55, 0xe2, 0xab, 0xa2, 0x1c,
|
||||
0x7e, 0x78, 0x18, 0xe1, 0xa1, 0x1f, 0xf9, 0xc5, 0xb4, 0xdb, 0xdd, 0xe3, 0x6e, 0x77, 0x5b, 0xb2,
|
||||
0xb4, 0x50, 0xe1, 0xdc, 0x49, 0xe0, 0x43, 0xe2, 0x78, 0xad, 0x98, 0xb1, 0xe0, 0x0a, 0x0b, 0xe3,
|
||||
0x88, 0x3d, 0xdb, 0x33, 0x87, 0x7f, 0x33, 0x95, 0xac, 0x55, 0x59, 0xed, 0xb9, 0xc3, 0x3f, 0xb9,
|
||||
0xc1, 0x55, 0x78, 0xa4, 0xb7, 0x2f, 0x3b, 0x96, 0x19, 0x5d, 0x19, 0x05, 0x02, 0xac, 0xc5, 0x81,
|
||||
0x91, 0x31, 0x6e, 0x70, 0xe7, 0x6e, 0xd2, 0xd9, 0xb9, 0x31, 0xe1, 0x0e, 0xb1, 0xa6, 0xdb, 0x35,
|
||||
0xc2, 0x82, 0xcc, 0xeb, 0x89, 0x93, 0x0e, 0x70, 0xd3, 0xee, 0x60, 0x36, 0x31, 0xd9, 0x23, 0x38,
|
||||
0xf1, 0x6d, 0x7c, 0xf3, 0x75, 0x64, 0x44, 0x05, 0x3a, 0xa7, 0xa4, 0x39, 0x55, 0xeb, 0xd3, 0xd8,
|
||||
0xd9, 0x15, 0xb4, 0x84, 0xc5, 0xd4, 0xec, 0x96, 0xee, 0x37, 0x96, 0x52, 0xb2, 0x70, 0x6e, 0x59,
|
||||
0xc5, 0xb8, 0xab, 0x87, 0x65, 0x57, 0x06, 0xfb, 0xc0, 0xfb, 0x17, 0x4b, 0x6b, 0x9c, 0xc9, 0x8c,
|
||||
0x1a, 0x91, 0x4d, 0x55, 0x91, 0x18, 0xdf, 0x84, 0x05, 0x24, 0xee, 0xf7, 0x49, 0x90, 0x9b, 0x6c,
|
||||
0xf5, 0x04, 0xda, 0xbd, 0x80, 0x17, 0xa6, 0x72, 0x01, 0xe9, 0x7b, 0x0c, 0x13, 0x46, 0x9b, 0x25,
|
||||
0xe8, 0x94, 0xb2, 0xf4, 0x5d, 0xf3, 0xcf, 0x3e, 0x5a, 0x6e, 0xc4, 0xac, 0xd4, 0xd2, 0xd6, 0xb7,
|
||||
0xf5, 0x12, 0xef, 0x40, 0xfa, 0xfd, 0x9f, 0xed, 0xfe, 0x1a, 0xc2, 0x61, 0xe4, 0x95, 0x3d, 0x99,
|
||||
0x35, 0xdc, 0xac, 0xb1, 0xc6, 0x67, 0x1c, 0x1d, 0x68, 0xc0, 0x39, 0x3c, 0x41, 0x55, 0xc9, 0x39,
|
||||
0x10, 0xae, 0x59, 0x6c, 0x84, 0xcc, 0xf3, 0xff, 0xc7, 0xdb, 0xf6, 0x17, 0x6a, 0x02, 0xc3, 0x7a,
|
||||
0x00, 0x04, 0x00, 0x00
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x52, 0xc9, 0x6e, 0xdb, 0x30,
|
||||
0x10, 0xfd, 0x15, 0x85, 0x28, 0x12, 0xd2, 0x62, 0x69, 0x47, 0x89, 0xdb, 0x42, 0x0a, 0x6b, 0xb4,
|
||||
0x41, 0x0e, 0x05, 0xba, 0x18, 0x75, 0x8b, 0x1c, 0x02, 0x03, 0xa1, 0xa5, 0x91, 0xc5, 0x86, 0x26,
|
||||
0x0d, 0x6a, 0xbc, 0x08, 0x8a, 0xfe, 0xbd, 0x94, 0xb3, 0x1e, 0xda, 0xcb, 0x70, 0x96, 0x37, 0xcb,
|
||||
0xe3, 0x4c, 0xb9, 0xb1, 0x39, 0x6a, 0x67, 0xa3, 0x35, 0xc0, 0x1d, 0x05, 0x8e, 0xf2, 0xe8, 0x94,
|
||||
0xb5, 0x5b, 0xe5, 0x23, 0x2f, 0x41, 0x2c, 0x01, 0x2f, 0x9d, 0x45, 0xd8, 0x23, 0x25, 0x49, 0x41,
|
||||
0x58, 0xa6, 0x4b, 0xea, 0x1f, 0xc2, 0x2e, 0x43, 0xdf, 0xb4, 0x4e, 0xa2, 0x5b, 0x8b, 0x9d, 0xb6,
|
||||
0x85, 0xdb, 0x89, 0x5d, 0xdd, 0xe5, 0x0a, 0xf3, 0x8a, 0x02, 0x6b, 0xbb, 0xf2, 0xa9, 0xb0, 0xa5,
|
||||
0xc8, 0xda, 0x1e, 0x1b, 0x72, 0xc9, 0x8d, 0x5b, 0xfc, 0x81, 0x1c, 0xa3, 0x4f, 0xde, 0xab, 0xe6,
|
||||
0xf3, 0xa6, 0x2c, 0xc1, 0xcf, 0x89, 0x94, 0xa1, 0xca, 0x0c, 0xbd, 0xb6, 0x4b, 0x91, 0x2b, 0x63,
|
||||
0x28, 0x8a, 0x42, 0xa1, 0x62, 0xac, 0x35, 0x80, 0x91, 0x92, 0x16, 0x76, 0xd1, 0x6f, 0x6d, 0xf1,
|
||||
0xc3, 0x21, 0xeb, 0x29, 0xda, 0xcf, 0xf2, 0xfe, 0xdd, 0x91, 0x54, 0x37, 0xa3, 0xf9, 0xfd, 0x7d,
|
||||
0xd2, 0x2b, 0xa7, 0x41, 0x39, 0xf2, 0xcc, 0x03, 0x6e, 0xbc, 0xcd, 0xfa, 0x64, 0x1d, 0xbc, 0xc9,
|
||||
0x9c, 0xe7, 0xe1, 0x39, 0x9b, 0x73, 0x23, 0xbf, 0x29, 0xac, 0xc4, 0x4a, 0x5b, 0x0a, 0x61, 0xe8,
|
||||
0x02, 0xab, 0xa1, 0xe6, 0x20, 0x2a, 0xd0, 0xcb, 0x0a, 0x87, 0x39, 0xe3, 0xf5, 0x03, 0xa0, 0x34,
|
||||
0xce, 0x79, 0xfa, 0x84, 0x79, 0x6b, 0x06, 0x9a, 0x0d, 0x13, 0x96, 0x1d, 0x68, 0xcb, 0xf3, 0xec,
|
||||
0x15, 0xb5, 0xc0, 0xf4, 0xa1, 0x5b, 0x34, 0x92, 0x12, 0x26, 0xa3, 0x34, 0x19, 0xc7, 0x49, 0x32,
|
||||
0x1e, 0xc0, 0x30, 0x19, 0x8f, 0xbb, 0x32, 0x54, 0xf1, 0x22, 0x37, 0xa0, 0xfc, 0xcf, 0xc0, 0x9a,
|
||||
0x8e, 0xf8, 0x88, 0x3f, 0x16, 0x7d, 0x6e, 0xcb, 0x78, 0x23, 0xc5, 0x38, 0x6b, 0x2e, 0xf2, 0xac,
|
||||
0x89, 0x63, 0xd6, 0xa7, 0xec, 0x7b, 0xc7, 0xfe, 0x42, 0x67, 0xfb, 0xe0, 0xf0, 0xa2, 0xd4, 0xc6,
|
||||
0xcc, 0xb0, 0x31, 0x20, 0x6f, 0xfd, 0x72, 0x41, 0xdf, 0xb4, 0x96, 0xaa, 0x1b, 0x37, 0x67, 0x1d,
|
||||
0x7f, 0x54, 0xe3, 0xd3, 0xd7, 0x46, 0x12, 0x0c, 0x76, 0xcb, 0xbd, 0x58, 0xc0, 0x52, 0xdb, 0x69,
|
||||
0xe0, 0x43, 0x59, 0xb0, 0x94, 0xcf, 0xe9, 0x7e, 0x60, 0xe2, 0x9a, 0x37, 0x03, 0xc3, 0xc5, 0x79,
|
||||
0x10, 0x23, 0x9e, 0x0c, 0x0e, 0x7c, 0xa7, 0x5f, 0x7a, 0x44, 0xdf, 0x27, 0x40, 0x5d, 0x2c, 0xcf,
|
||||
0xba, 0x97, 0x45, 0xe6, 0xce, 0xd6, 0xce, 0x80, 0x00, 0xef, 0xc3, 0x68, 0x64, 0x1a, 0xce, 0x24,
|
||||
0xba, 0x9e, 0x45, 0x07, 0x33, 0x25, 0x1c, 0x58, 0xd7, 0xb9, 0xe3, 0x63, 0x27, 0x3c, 0xa8, 0xa2,
|
||||
0x99, 0xa1, 0x42, 0x08, 0xeb, 0xbc, 0x86, 0xc5, 0xcc, 0xe5, 0x77, 0x80, 0xe2, 0xc7, 0xf4, 0xea,
|
||||
0xfb, 0xc4, 0x89, 0x1a, 0x6c, 0x41, 0x49, 0x7b, 0x62, 0xb6, 0x27, 0x29, 0xfa, 0x0d, 0x74, 0x84,
|
||||
0xa5, 0xd4, 0x1d, 0x36, 0xfb, 0x8c, 0xa5, 0x94, 0x54, 0x88, 0xeb, 0x3a, 0x0d, 0x07, 0xf1, 0x78,
|
||||
0x51, 0xc6, 0x85, 0x39, 0xc2, 0x4f, 0x8b, 0xb5, 0x77, 0xe8, 0x72, 0x67, 0x26, 0x64, 0x57, 0xd7,
|
||||
0x24, 0x0d, 0x92, 0xb0, 0x98, 0xa4, 0xc3, 0x21, 0x89, 0x0b, 0x97, 0x6f, 0x56, 0x60, 0xf1, 0x05,
|
||||
0x5c, 0xb9, 0x1a, 0x63, 0x32, 0xec, 0x31, 0x4c, 0x38, 0xeb, 0xd6, 0x60, 0x25, 0x65, 0xf2, 0x63,
|
||||
0xfb, 0xcf, 0x39, 0x3a, 0xee, 0xc4, 0x42, 0x5b, 0xe5, 0x9b, 0x5f, 0xcd, 0x1a, 0x24, 0x51, 0xfd,
|
||||
0x91, 0x2d, 0x0e, 0xa7, 0x49, 0x38, 0x4e, 0x7a, 0x66, 0x2b, 0xb7, 0x85, 0xab, 0x6d, 0xe8, 0xf1,
|
||||
0x55, 0xd7, 0x08, 0x16, 0xc2, 0x3f, 0xac, 0xa0, 0xae, 0xd5, 0x12, 0x08, 0xb7, 0x2c, 0x75, 0x42,
|
||||
0x15, 0xc5, 0xff, 0xe3, 0x5d, 0xf7, 0x17, 0x51, 0xe6, 0x9d, 0x18, 0x65, 0x03, 0x00, 0x00
|
||||
};
|
||||
|
||||
|
||||
|
||||
4393
wled00/html_ui.h
4393
wled00/html_ui.h
File diff suppressed because it is too large
Load Diff
@@ -165,7 +165,7 @@ bool sendLiveLedsWs(uint32_t wsClient)
|
||||
const size_t MAX_LIVE_LEDS_WS = 1024U; //WLEDMM use 4096 as max matrix size
|
||||
#endif
|
||||
size_t n = ((used -1)/MAX_LIVE_LEDS_WS) +1; //only serve every n'th LED if count over MAX_LIVE_LEDS_WS
|
||||
size_t pos = (strip.isMatrix ? 6 : 2); // start of data WLEDMM 6 instead of 4
|
||||
size_t pos = (strip.isMatrix ? 4 : 2);
|
||||
size_t bufSize = pos + (used/n)*3;
|
||||
size_t skipLines = 0;
|
||||
|
||||
@@ -179,8 +179,6 @@ bool sendLiveLedsWs(uint32_t wsClient)
|
||||
buffer[1] = 2; //version
|
||||
buffer[2] = Segment::maxWidth;
|
||||
buffer[3] = Segment::maxHeight;
|
||||
buffer[4] = currentPreset; //WLEDMM
|
||||
buffer[5] = currentPlaylist; //WLEDMM
|
||||
if (Segment::maxWidth * Segment::maxHeight > MAX_LIVE_LEDS_WS*4) {
|
||||
buffer[2] = Segment::maxWidth/4;
|
||||
buffer[3] = Segment::maxHeight/4;
|
||||
|
||||
Reference in New Issue
Block a user