Reverse proxy WSS support.

This commit is contained in:
Blaz Kristan 2022-03-08 16:16:07 +01:00
parent 2d1511b5dd
commit a3cd10d83b
6 changed files with 585 additions and 583 deletions

View File

@ -1028,16 +1028,16 @@ function updateUI()
updateTrail(gId('sliderC2'));
updateTrail(gId('sliderC3'));
gId('wwrap').style.display = (hasWhite) ? "block":"none";
gId('wbal').style.display = (hasCCT) ? "block":"none";
gId('wwrap').style.display = (hasWhite) ? "block":"none"; // white channel
gId('wbal').style.display = (hasCCT) ? "block":"none"; // white balance
var ccfg = cfg.comp.colors;
gId('hexw').style.display = ccfg.hex ? "block":"none";
gId('picker').style.display = (hasRGB && ccfg.picker) ? "block":"none";
gId('vwrap').style.display = (hasRGB && ccfg.picker) ? "block":"none";
gId('kwrap').style.display = (hasRGB && !hasCCT && ccfg.picker) ? "block":"none";
gId('rgbwrap').style.display = (hasRGB && ccfg.rgb) ? "block":"none";
gId('qcs-w').style.display = (hasRGB && ccfg.quick) ? "block":"none";
gId('palw').style.display = hasRGB ? "block":"none";
gId('hexw').style.display = ccfg.hex ? "block":"none"; // HEX input
gId('picker').style.display = (hasRGB && ccfg.picker) ? "block":"none"; // color picker wheel
gId('vwrap').style.display = (hasRGB && ccfg.picker) ? "block":"none"; // brightness (value) slider
gId('kwrap').style.display = (hasRGB && !hasCCT && ccfg.picker) ? "block":"none"; // Kelvin slider
gId('rgbwrap').style.display = (hasRGB && ccfg.rgb) ? "block":"none"; // RGB sliders
gId('qcs-w').style.display = (hasRGB && ccfg.quick) ? "block":"none"; // quick selection
gId('palw').style.display = hasRGB ? "block":"none"; // palettes
updatePA();
updatePSliders();
@ -1098,7 +1098,7 @@ function cmpP(a, b)
function makeWS() {
//if (ws) { ws.close(); ws=null; }
if (ws || lastinfo.ws < 0) return;
ws = new WebSocket('ws://'+(loc?locip:window.location.hostname)+'/ws');
ws = new WebSocket((window.location.protocol == "https:"?"wss":"ws")+'://'+(loc?locip:window.location.hostname)+'/ws');
ws.binaryType = "arraybuffer";
ws.onmessage = (e)=>{
if (e.data instanceof ArrayBuffer) return; //liveview packet
@ -1165,18 +1165,18 @@ function readState(s,command=false)
if (sellvl < 2) selc = i; // get first selected segment
sellvl = 2;
var lc = lastinfo.leds.seglc[s.seg[i].id];
hasRGB |= lc & 0x01;
hasWhite |= lc & 0x02;
hasCCT |= lc & 0x04;
hasRGB |= !!(lc & 0x01);
hasWhite |= !!(lc & 0x08);
hasCCT |= !!(lc & 0x04);
}
//if(s.seg[i].sel) {selc = ind; break;} ind++;
}
var i=s.seg[selc];
if (sellvl == 1) {
var lc = lastinfo.leds.seglc[i.id];
hasRGB = lc & 0x01;
hasWhite = lc & 0x02;
hasCCT = lc & 0x04;
hasRGB = !!(lc & 0x01);
hasWhite = !!(lc & 0x08);
hasCCT = !!(lc & 0x04);
}
if (!i) {
showToast('No Segments!', true);

View File

@ -51,7 +51,7 @@
ws.send("{'lv':true}");
} else {
console.info("Peek WS opening");
ws = new WebSocket("ws://"+document.location.host+"/ws");
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}");

View File

@ -230,53 +230,54 @@ const uint8_t PAGE_liveview[] PROGMEM = {
// Autogenerated from wled00/data/liveviewws.htm, do not edit!!
const uint16_t PAGE_liveviewws_length = 707;
const uint16_t PAGE_liveviewws_length = 729;
const uint8_t PAGE_liveviewws[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x54, 0x6d, 0x6f, 0x9b, 0x30,
0x10, 0xfe, 0x9e, 0x5f, 0x41, 0xdd, 0xad, 0x03, 0x85, 0x90, 0xb4, 0xd3, 0xde, 0x00, 0x67, 0x5a,
0xd7, 0x7c, 0xd8, 0x54, 0xad, 0x95, 0xda, 0xa9, 0x9a, 0xaa, 0x4a, 0x33, 0x70, 0x01, 0xaf, 0x60,
0x47, 0xf6, 0x11, 0x14, 0x45, 0xfc, 0xf7, 0x9d, 0x49, 0x9b, 0xee, 0x95, 0x0f, 0xc1, 0xc6, 0x77,
0xcf, 0xf3, 0xdc, 0x73, 0xbe, 0xa4, 0x07, 0x67, 0x17, 0x1f, 0xaf, 0xbf, 0x5d, 0x2e, 0xbc, 0x0a,
0x9b, 0x7a, 0x9e, 0x3e, 0xfc, 0x82, 0x28, 0xe6, 0x69, 0x03, 0x28, 0x3c, 0x25, 0x1a, 0xe0, 0x6c,
0x2d, 0xa1, 0x5b, 0x69, 0x83, 0xcc, 0x1b, 0xe5, 0x5a, 0x21, 0x28, 0xe4, 0xac, 0x93, 0x05, 0x56,
0xbc, 0x80, 0xb5, 0xcc, 0x61, 0x32, 0x6c, 0x42, 0xa9, 0x24, 0x4a, 0x51, 0x4f, 0x6c, 0x2e, 0x6a,
0xe0, 0xc7, 0x61, 0x43, 0x1f, 0x9a, 0xb6, 0x79, 0xdc, 0xb3, 0x07, 0xcc, 0x51, 0x5e, 0x09, 0x63,
0x81, 0x30, 0x5a, 0x5c, 0x4e, 0xde, 0xb2, 0xdf, 0xa8, 0xb0, 0x82, 0x06, 0x26, 0xb9, 0xae, 0xb5,
0x61, 0xde, 0x9e, 0xec, 0xf0, 0x64, 0x78, 0x28, 0x14, 0x25, 0xd6, 0x30, 0x1f, 0xdd, 0x9c, 0x2f,
0xce, 0xbc, 0x73, 0xb9, 0x06, 0xef, 0xd2, 0x80, 0x93, 0x97, 0x4e, 0x77, 0x27, 0xa9, 0xc5, 0x8d,
0x0b, 0xc8, 0x74, 0xb1, 0xd9, 0x36, 0xc2, 0x94, 0x52, 0xc5, 0xb3, 0xfe, 0x30, 0x17, 0x6a, 0xbd,
0xcd, 0x44, 0x7e, 0x5f, 0x1a, 0xdd, 0xaa, 0x22, 0x3e, 0x9c, 0xcd, 0x66, 0xc9, 0x52, 0xd6, 0x08,
0x26, 0xce, 0x8c, 0x2c, 0x2b, 0x54, 0x60, 0xad, 0x7f, 0xfc, 0xe6, 0xd5, 0xf3, 0x20, 0x19, 0xaa,
0x89, 0x8f, 0x67, 0xb3, 0xe7, 0x49, 0x05, 0xee, 0x6c, 0xb7, 0x5e, 0x69, 0x4b, 0xf5, 0x69, 0x15,
0x8b, 0xcc, 0xea, 0xba, 0x45, 0xe8, 0x47, 0xe9, 0x74, 0x47, 0x97, 0x4e, 0x77, 0x9e, 0x39, 0xd6,
0x79, 0x5a, 0xc8, 0xb5, 0x27, 0x0b, 0xce, 0x1c, 0x29, 0x49, 0xb6, 0xb9, 0x91, 0x2b, 0x9c, 0x8f,
0x96, 0xad, 0xca, 0x5d, 0xbe, 0xd7, 0xae, 0x0a, 0x81, 0xf0, 0x20, 0xdc, 0x87, 0x60, 0xbb, 0x16,
0xc6, 0x53, 0x9c, 0xd5, 0x52, 0x81, 0x30, 0x93, 0xd2, 0x88, 0x42, 0x52, 0xd9, 0xfe, 0xbb, 0x59,
0x01, 0x65, 0xc8, 0x42, 0xe4, 0x10, 0xd5, 0xa0, 0x4a, 0xac, 0x92, 0xa5, 0x36, 0xbe, 0xe4, 0x27,
0x89, 0x4c, 0x31, 0x91, 0x63, 0xfe, 0x32, 0x50, 0x63, 0xfe, 0xdd, 0x94, 0x99, 0xff, 0x6c, 0x0b,
0xb7, 0xf2, 0xae, 0x0f, 0x87, 0xf7, 0xf8, 0x78, 0xbf, 0x3a, 0xb9, 0xeb, 0x83, 0xef, 0x21, 0x85,
0x4f, 0x5e, 0x1e, 0x1d, 0xf9, 0x14, 0xcd, 0x42, 0x16, 0x24, 0xee, 0x1d, 0xb0, 0xb0, 0xd0, 0x79,
0xdb, 0x10, 0x53, 0x54, 0x02, 0x2e, 0x6a, 0x70, 0xcb, 0xd3, 0xcd, 0xa7, 0xc2, 0xdf, 0x29, 0x0f,
0xa2, 0xa1, 0xb8, 0xe8, 0xc9, 0x36, 0xae, 0xfa, 0x7d, 0x11, 0x94, 0xe2, 0xfc, 0xff, 0x6c, 0xb5,
0x72, 0x25, 0xa0, 0xd9, 0x6c, 0xe5, 0xd2, 0x67, 0xb7, 0x3a, 0xfb, 0x01, 0x39, 0x7a, 0x1f, 0x8c,
0x11, 0x9b, 0xd3, 0x76, 0xb9, 0x04, 0x73, 0xc7, 0x38, 0xe7, 0xa8, 0xaf, 0xd0, 0x48, 0x55, 0x46,
0x74, 0x17, 0x6a, 0x1f, 0x22, 0x72, 0x40, 0x04, 0xc1, 0xb6, 0x06, 0xf4, 0x80, 0x2b, 0xe8, 0xbc,
0xaf, 0x52, 0xe1, 0xdb, 0x21, 0xcb, 0x87, 0xb5, 0xd3, 0x34, 0x44, 0x24, 0x84, 0xf9, 0xe6, 0xf5,
0x01, 0x87, 0xdb, 0xd9, 0x5d, 0x60, 0x00, 0x5b, 0xa3, 0x92, 0x3f, 0xed, 0xeb, 0xfb, 0x5c, 0x60,
0x5e, 0x39, 0x15, 0x74, 0x61, 0xa8, 0x35, 0x10, 0x81, 0x31, 0x64, 0x14, 0xbb, 0x04, 0xb8, 0xf7,
0x6e, 0xae, 0xbc, 0x61, 0x1b, 0xb3, 0xd0, 0xc5, 0x3a, 0xaf, 0x3b, 0x4b, 0x7a, 0x56, 0x51, 0x27,
0x55, 0xa1, 0xbb, 0xa8, 0xb3, 0x49, 0x67, 0x8f, 0x8e, 0x3a, 0x1b, 0x19, 0x6a, 0xe2, 0xe6, 0x0a,
0x09, 0x9d, 0x14, 0xdf, 0x40, 0x76, 0xa5, 0xf3, 0x7b, 0xc0, 0xe8, 0xe2, 0x72, 0xf1, 0xe5, 0xbd,
0xff, 0x88, 0x2d, 0xd5, 0x52, 0x3f, 0x40, 0xb7, 0x16, 0xac, 0x47, 0x48, 0xc4, 0xc1, 0x82, 0x90,
0x00, 0x2c, 0x28, 0x72, 0x6f, 0xfb, 0xa2, 0x5e, 0xbf, 0x88, 0xd1, 0xb4, 0xd0, 0xb3, 0x20, 0x88,
0xff, 0x95, 0x49, 0xa2, 0xf4, 0x0a, 0x14, 0x19, 0x42, 0x89, 0x3e, 0xe9, 0x71, 0x16, 0xec, 0x19,
0x7d, 0xd6, 0xd9, 0x78, 0x3a, 0x65, 0xe3, 0x7d, 0x83, 0x6a, 0x4d, 0x35, 0x92, 0xed, 0x51, 0xa5,
0x2d, 0x8e, 0xd9, 0xb4, 0xb3, 0x84, 0x1c, 0x69, 0xe5, 0x40, 0xf8, 0x63, 0x4f, 0xfc, 0x27, 0x03,
0xfe, 0xa6, 0xfa, 0xaf, 0xc0, 0x7e, 0x38, 0xc8, 0xa4, 0x12, 0x66, 0x73, 0xbd, 0x59, 0xd1, 0x0c,
0x0a, 0xd7, 0x85, 0x6c, 0xe8, 0x1d, 0x73, 0x67, 0xa2, 0x28, 0x16, 0xae, 0x25, 0xe7, 0xd2, 0xd2,
0x38, 0x02, 0x19, 0xdb, 0xd0, 0xb0, 0x88, 0x12, 0x58, 0xf8, 0xcb, 0x2d, 0x08, 0xdc, 0x34, 0xec,
0xae, 0x7a, 0x3a, 0xdd, 0x0d, 0xc2, 0x74, 0xf8, 0x3f, 0xf9, 0x09, 0x4a, 0x12, 0xea, 0x80, 0x65,
0x04, 0x00, 0x00
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x54, 0xdb, 0x8e, 0x9b, 0x30,
0x10, 0x7d, 0xcf, 0x57, 0x50, 0x6f, 0xbb, 0x05, 0x85, 0x90, 0xec, 0x56, 0xbd, 0x01, 0x4e, 0xd5,
0x4b, 0x1e, 0x5a, 0xad, 0xda, 0x95, 0xb6, 0xd5, 0xaa, 0x5a, 0xad, 0x54, 0x03, 0x13, 0x70, 0x17,
0x6c, 0x64, 0x0f, 0x41, 0x51, 0xc4, 0xbf, 0x77, 0x4c, 0xb2, 0xe9, 0x9d, 0x07, 0x63, 0x33, 0x97,
0x73, 0xe6, 0x8c, 0x87, 0xf4, 0xc1, 0xbb, 0x4f, 0x6f, 0x3f, 0x7f, 0xbd, 0x5c, 0x79, 0x15, 0x36,
0xf5, 0x32, 0x3d, 0xac, 0x20, 0x8a, 0x65, 0xda, 0x00, 0x0a, 0x4f, 0x89, 0x06, 0x38, 0xdb, 0x48,
0xe8, 0x5b, 0x6d, 0x90, 0x79, 0x93, 0x5c, 0x2b, 0x04, 0x85, 0x9c, 0xf5, 0xb2, 0xc0, 0x8a, 0x17,
0xb0, 0x91, 0x39, 0xcc, 0xc6, 0x43, 0x28, 0x95, 0x44, 0x29, 0xea, 0x99, 0xcd, 0x45, 0x0d, 0xfc,
0x2c, 0x6c, 0xe8, 0x43, 0xd3, 0x35, 0xf7, 0x67, 0x76, 0xc8, 0x39, 0xc9, 0x2b, 0x61, 0x2c, 0x50,
0x8e, 0x0e, 0xd7, 0xb3, 0x17, 0xec, 0x37, 0x28, 0xac, 0xa0, 0x81, 0x59, 0xae, 0x6b, 0x6d, 0x98,
0x77, 0x04, 0x3b, 0x39, 0x1f, 0x1f, 0x72, 0x45, 0x89, 0x35, 0x2c, 0x27, 0xd7, 0x17, 0xab, 0x77,
0xde, 0x85, 0xdc, 0x80, 0x77, 0x69, 0xc0, 0xd1, 0x4b, 0xe7, 0x7b, 0x4b, 0x6a, 0x71, 0xeb, 0x1c,
0x32, 0x5d, 0x6c, 0x77, 0x8d, 0x30, 0xa5, 0x54, 0xf1, 0x62, 0x38, 0xc9, 0x85, 0xda, 0xec, 0x32,
0x91, 0xdf, 0x95, 0x46, 0x77, 0xaa, 0x88, 0x4f, 0x16, 0x8b, 0x45, 0xb2, 0x96, 0x35, 0x82, 0x89,
0x33, 0x23, 0xcb, 0x0a, 0x15, 0x58, 0xeb, 0x9f, 0x3d, 0x7f, 0xfa, 0x28, 0x48, 0xc6, 0x6a, 0xe2,
0xb3, 0xc5, 0xe2, 0x51, 0x52, 0x81, 0xb3, 0xed, 0xf7, 0xad, 0xb6, 0x54, 0x9f, 0x56, 0xb1, 0xc8,
0xac, 0xae, 0x3b, 0x84, 0x61, 0x92, 0xce, 0xf7, 0x70, 0xe9, 0x7c, 0xaf, 0x99, 0x43, 0x5d, 0xa6,
0x85, 0xdc, 0x78, 0xb2, 0xe0, 0xcc, 0x81, 0x12, 0x65, 0x9b, 0x1b, 0xd9, 0xe2, 0x72, 0xb2, 0xee,
0x54, 0xee, 0xe2, 0xbd, 0xae, 0x2d, 0x04, 0xc2, 0x81, 0xb8, 0x0f, 0xc1, 0x6e, 0x23, 0x8c, 0xa7,
0x38, 0xab, 0xa5, 0x02, 0x61, 0x66, 0xa5, 0x11, 0x85, 0xa4, 0xb2, 0xfd, 0x97, 0x8b, 0x02, 0xca,
0x90, 0x85, 0x9a, 0x43, 0x54, 0x83, 0x2a, 0xb1, 0x4a, 0xd6, 0xda, 0xf8, 0x92, 0x9f, 0x27, 0x32,
0xd5, 0x89, 0x9c, 0xf2, 0x27, 0x81, 0x9a, 0xf2, 0x6f, 0xa6, 0xcc, 0xfc, 0x87, 0x3b, 0xb8, 0x91,
0xb7, 0x43, 0x38, 0xbe, 0xa7, 0x67, 0xc7, 0xdd, 0xf9, 0xed, 0x10, 0x7c, 0x0b, 0xc9, 0x7d, 0xf6,
0xe4, 0xf4, 0xd4, 0x27, 0x6f, 0x16, 0xb2, 0x20, 0x71, 0xef, 0x80, 0x85, 0x85, 0xce, 0xbb, 0x86,
0x90, 0xa2, 0x12, 0x70, 0x55, 0x83, 0xdb, 0xbe, 0xd9, 0xbe, 0x2f, 0xfc, 0x3d, 0xf3, 0x20, 0x1a,
0x8b, 0x8b, 0x7e, 0xca, 0xc6, 0xd5, 0x70, 0x2c, 0x82, 0x42, 0x9c, 0xfe, 0x1f, 0xac, 0x56, 0xae,
0x04, 0x34, 0xdb, 0x9d, 0x5c, 0xfb, 0xec, 0x46, 0x67, 0xdf, 0x21, 0x47, 0xef, 0xb5, 0x31, 0x62,
0xfb, 0xa6, 0x5b, 0xaf, 0xc1, 0xdc, 0x32, 0xce, 0x39, 0xea, 0x2b, 0x34, 0x52, 0x95, 0x11, 0xdd,
0x85, 0xda, 0x87, 0x88, 0x14, 0x10, 0x41, 0xb0, 0xab, 0x01, 0x3d, 0xe0, 0x0a, 0x7a, 0xef, 0x8b,
0x54, 0xf8, 0x62, 0x8c, 0xf2, 0x61, 0xe3, 0x38, 0x8d, 0x1e, 0x09, 0xe5, 0x7c, 0xfe, 0xec, 0x01,
0x87, 0x9b, 0xc5, 0x6d, 0x60, 0x00, 0x3b, 0xa3, 0x92, 0x3f, 0xe5, 0x1b, 0x86, 0x5c, 0x60, 0x5e,
0x39, 0x16, 0x74, 0x61, 0xa8, 0x35, 0x10, 0x81, 0x31, 0x24, 0x14, 0xbb, 0x04, 0xb8, 0xf3, 0xae,
0xaf, 0xbc, 0xf1, 0x18, 0xb3, 0xd0, 0xf9, 0x3a, 0xad, 0x7b, 0x4b, 0x7c, 0xda, 0xa8, 0x97, 0xaa,
0xd0, 0x7d, 0xd4, 0xdb, 0xa4, 0xb7, 0xa7, 0xa7, 0xbd, 0x8d, 0x0c, 0x35, 0x71, 0x7b, 0x85, 0x94,
0x9d, 0x18, 0x5f, 0x43, 0x76, 0xa5, 0xf3, 0x3b, 0xc0, 0xe8, 0xd3, 0xe5, 0xea, 0xe3, 0x2b, 0xff,
0x3e, 0xb7, 0x54, 0x6b, 0x7d, 0x48, 0xdd, 0x59, 0xb0, 0x1e, 0x65, 0x22, 0x0c, 0x16, 0x84, 0x94,
0xc0, 0x82, 0x22, 0xf5, 0x76, 0x8f, 0xeb, 0xcd, 0xe3, 0x18, 0x4d, 0x07, 0x03, 0x0b, 0x82, 0xf8,
0x5f, 0x91, 0x44, 0x4a, 0xb7, 0xa0, 0x48, 0x10, 0x0a, 0xf4, 0x89, 0x8f, 0x93, 0xe0, 0x88, 0xe8,
0xfb, 0xac, 0x42, 0x6c, 0x6d, 0x4c, 0xca, 0x1d, 0x48, 0xd6, 0x9a, 0x8a, 0x24, 0xdd, 0xa3, 0xd6,
0x68, 0xd4, 0x34, 0x1f, 0xaf, 0x58, 0x6f, 0x2d, 0x8b, 0x69, 0x65, 0xc1, 0x94, 0xc5, 0xf3, 0x39,
0x9b, 0x1e, 0xdb, 0x79, 0x74, 0xae, 0xb4, 0xc5, 0x29, 0x9b, 0x3b, 0x9f, 0x20, 0xd2, 0xca, 0x41,
0xf2, 0xfb, 0x0e, 0xfa, 0x3f, 0xe5, 0xfa, 0x9b, 0xd8, 0x7f, 0xcb, 0x19, 0x46, 0x43, 0x26, 0x95,
0x30, 0xdb, 0xcf, 0xdb, 0x96, 0x26, 0x56, 0xb8, 0x9e, 0x65, 0x63, 0xa7, 0x99, 0xb3, 0x89, 0xa2,
0x58, 0xb9, 0x06, 0x5e, 0x48, 0x4b, 0xc3, 0x0b, 0xd4, 0x86, 0x86, 0x46, 0x4b, 0x94, 0xc0, 0xc2,
0x5f, 0xee, 0x4c, 0xe0, 0x66, 0x67, 0x3f, 0x18, 0xe9, 0x7c, 0x3f, 0x36, 0xf3, 0xf1, 0xef, 0xf3,
0x03, 0xff, 0x9d, 0x3a, 0x93, 0x93, 0x04, 0x00, 0x00
};

View File

@ -8,7 +8,7 @@
// Autogenerated from wled00/data/style.css, do not edit!!
const uint16_t PAGE_settingsCss_length = 824;
const uint8_t PAGE_settingsCss[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x55, 0x5d, 0x8b, 0x9c, 0x30,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x55, 0x5d, 0x8b, 0x9c, 0x30,
0x14, 0xfd, 0x2b, 0x96, 0x61, 0x61, 0x0b, 0xa3, 0xa8, 0xa3, 0xb3, 0xd3, 0x48, 0xa1, 0xf4, 0xbd,
0x6f, 0xa5, 0x14, 0xca, 0x3e, 0x44, 0x73, 0x1d, 0xc3, 0xe4, 0x43, 0x92, 0xd8, 0x75, 0x2a, 0xfe,
0xf7, 0x26, 0x7e, 0xac, 0xce, 0xac, 0x6c, 0x5f, 0xca, 0xe0, 0xa0, 0xde, 0x98, 0x7b, 0xee, 0xb9,
@ -66,7 +66,7 @@ const uint8_t PAGE_settingsCss[] PROGMEM = {
// Autogenerated from wled00/data/settings.htm, do not edit!!
const uint16_t PAGE_settings_length = 670;
const uint8_t PAGE_settings[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x8d, 0x54, 0xdb, 0x6e, 0xdb, 0x30,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x8d, 0x54, 0xdb, 0x6e, 0xdb, 0x30,
0x0c, 0x7d, 0xf7, 0x57, 0x68, 0x2e, 0x36, 0x24, 0x40, 0xdc, 0xb4, 0xe9, 0x30, 0x0c, 0xbe, 0x64,
0x40, 0xd7, 0x6e, 0x2b, 0xb0, 0xa2, 0x05, 0x7a, 0xdb, 0x1e, 0x65, 0x89, 0x76, 0xb8, 0x5a, 0x92,
0x21, 0xd1, 0x69, 0xb2, 0x20, 0xff, 0x3e, 0xd9, 0x49, 0xd3, 0xae, 0x5d, 0xb0, 0xbc, 0x18, 0x26,
@ -114,7 +114,7 @@ const uint8_t PAGE_settings[] PROGMEM = {
// Autogenerated from wled00/data/settings_wifi.htm, do not edit!!
const uint16_t PAGE_settings_wifi_length = 1240;
const uint8_t PAGE_settings_wifi[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x57, 0x6d, 0x6f, 0xe2, 0x46,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x57, 0x6d, 0x6f, 0xe2, 0x46,
0x10, 0xfe, 0xee, 0x5f, 0xb1, 0xdd, 0x4a, 0x15, 0x48, 0x60, 0xde, 0x9a, 0x28, 0xa2, 0x36, 0x57,
0x02, 0x34, 0x44, 0xba, 0xe6, 0xa8, 0x40, 0x8d, 0xfa, 0xe9, 0xb4, 0xd8, 0x03, 0xde, 0xc6, 0xde,
0xf5, 0x79, 0xd7, 0x18, 0x74, 0xbd, 0xff, 0xde, 0x59, 0xdb, 0xbc, 0x87, 0xf4, 0x1a, 0xa1, 0x28,
@ -198,7 +198,7 @@ const uint8_t PAGE_settings_wifi[] PROGMEM = {
// Autogenerated from wled00/data/settings_leds.htm, do not edit!!
const uint16_t PAGE_settings_leds_length = 6903;
const uint8_t PAGE_settings_leds[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xdd, 0x3c, 0xdb, 0x56, 0xe3, 0x48,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xdd, 0x3c, 0xdb, 0x56, 0xe3, 0x48,
0x92, 0xef, 0xfe, 0x8a, 0x24, 0xbb, 0x9b, 0x96, 0x06, 0x61, 0x24, 0x5f, 0x68, 0xca, 0xb6, 0xcc,
0x62, 0xea, 0xd2, 0xec, 0x40, 0x17, 0x07, 0xd3, 0xdd, 0xb3, 0xa7, 0xa6, 0x4e, 0x93, 0x96, 0xd3,
0xb6, 0x0a, 0x59, 0xf2, 0x48, 0x32, 0xe0, 0x05, 0xef, 0x37, 0xed, 0x37, 0xec, 0x97, 0x6d, 0x44,
@ -636,7 +636,7 @@ const uint8_t PAGE_settings_leds[] PROGMEM = {
// Autogenerated from wled00/data/settings_dmx.htm, do not edit!!
const uint16_t PAGE_settings_dmx_length = 1324;
const uint8_t PAGE_settings_dmx[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x56, 0x5b, 0x6f, 0xdb, 0x36,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x56, 0x5b, 0x6f, 0xdb, 0x36,
0x14, 0x7e, 0xd7, 0xaf, 0x60, 0xf9, 0x62, 0x09, 0x71, 0x25, 0x2b, 0x99, 0xbb, 0xd5, 0x91, 0x94,
0xd5, 0x4e, 0xe0, 0x04, 0x68, 0xb2, 0xa2, 0x6e, 0xd7, 0x0d, 0xcb, 0x30, 0xd0, 0x12, 0x6d, 0xb1,
0x91, 0x48, 0x8d, 0xa4, 0xec, 0xb8, 0xc3, 0xfe, 0xfb, 0x0e, 0x45, 0x49, 0x76, 0xd3, 0xa6, 0x5d,
@ -725,7 +725,7 @@ const uint8_t PAGE_settings_dmx[] PROGMEM = {
// Autogenerated from wled00/data/settings_ui.htm, do not edit!!
const uint16_t PAGE_settings_ui_length = 2784;
const uint8_t PAGE_settings_ui[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x59, 0x6b, 0x73, 0xdb, 0xb8,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x59, 0x6b, 0x73, 0xdb, 0xb8,
0x15, 0xfd, 0xae, 0x5f, 0x81, 0x20, 0x19, 0xaf, 0x38, 0x66, 0x68, 0xd9, 0xd9, 0x4e, 0x13, 0x49,
0x94, 0x1b, 0x3f, 0x92, 0xb8, 0xe3, 0x34, 0x69, 0x64, 0x37, 0xbb, 0x93, 0xf1, 0x78, 0x21, 0x12,
0x92, 0x10, 0x83, 0x00, 0x97, 0x00, 0x6d, 0xab, 0x8a, 0xfe, 0x7b, 0xef, 0x05, 0x48, 0x89, 0x92,
@ -905,7 +905,7 @@ const uint8_t PAGE_settings_ui[] PROGMEM = {
// Autogenerated from wled00/data/settings_sync.htm, do not edit!!
const uint16_t PAGE_settings_sync_length = 2814;
const uint8_t PAGE_settings_sync[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x1a, 0x5b, 0x77, 0xda, 0x38,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x1a, 0x5b, 0x77, 0xda, 0x38,
0xf3, 0xdd, 0xbf, 0x42, 0xeb, 0x87, 0x6e, 0xd8, 0x12, 0x30, 0x10, 0x68, 0x4a, 0xb0, 0xfb, 0x85,
0x90, 0x26, 0x39, 0xdb, 0x34, 0x14, 0xd2, 0xed, 0xee, 0xd3, 0x1e, 0x61, 0x0b, 0x70, 0xb0, 0x2d,
0xaf, 0x25, 0xe7, 0x72, 0xf6, 0xec, 0x7f, 0xff, 0x66, 0x24, 0xdb, 0x80, 0xb9, 0xf6, 0x21, 0x46,
@ -1087,7 +1087,7 @@ const uint8_t PAGE_settings_sync[] PROGMEM = {
// Autogenerated from wled00/data/settings_time.htm, do not edit!!
const uint16_t PAGE_settings_time_length = 3013;
const uint8_t PAGE_settings_time[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xcd, 0x1a, 0xfd, 0x73, 0xda, 0xb8,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x1a, 0xfd, 0x73, 0xda, 0xb8,
0xf2, 0x77, 0xff, 0x15, 0x8a, 0xdb, 0xc9, 0xc1, 0x85, 0xef, 0x94, 0x16, 0x02, 0x76, 0x8f, 0x00,
0x6d, 0xda, 0x06, 0x92, 0x39, 0xe8, 0xe5, 0x5d, 0x3f, 0xe6, 0x2a, 0x6c, 0x01, 0x4e, 0x8c, 0xcc,
0xb3, 0xe4, 0x90, 0xbc, 0x34, 0xff, 0xfb, 0x5b, 0x49, 0xb6, 0xc1, 0x0e, 0x26, 0x69, 0xef, 0xde,
@ -1282,7 +1282,7 @@ const uint8_t PAGE_settings_time[] PROGMEM = {
// Autogenerated from wled00/data/settings_sec.htm, do not edit!!
const uint16_t PAGE_settings_sec_length = 1936;
const uint8_t PAGE_settings_sec[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x58, 0x6b, 0x6f, 0xdb, 0xb8,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x58, 0x6b, 0x6f, 0xdb, 0xb8,
0x12, 0xfd, 0xae, 0x5f, 0x41, 0xab, 0x40, 0xd7, 0x06, 0x14, 0x29, 0x71, 0xe2, 0x36, 0x0f, 0xcb,
0xbd, 0x79, 0x38, 0x9b, 0x00, 0x49, 0x13, 0xc4, 0xee, 0x76, 0x2f, 0x16, 0x8b, 0x82, 0x96, 0xc6,
0x16, 0x6b, 0x99, 0xd4, 0x92, 0x54, 0x5c, 0xdf, 0x6e, 0xff, 0xfb, 0x9d, 0xa1, 0x24, 0xdb, 0x49,
@ -1409,7 +1409,7 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
// Autogenerated from wled00/data/settings_um.htm, do not edit!!
const uint16_t PAGE_settings_um_length = 1767;
const uint8_t PAGE_settings_um[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xa5, 0x57, 0x6d, 0x6f, 0xdb, 0x38,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x57, 0x6d, 0x6f, 0xdb, 0x38,
0x12, 0xfe, 0xee, 0x5f, 0xc1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0x6c, 0x37, 0xdb, 0xdb, 0xd4, 0x36,
0xe5, 0xdd, 0xf4, 0xe5, 0x1a, 0xa0, 0xbd, 0x04, 0x48, 0x77, 0x0f, 0x87, 0x20, 0xd8, 0xc8, 0xd2,
0xc8, 0xe6, 0x46, 0x22, 0x05, 0x92, 0xb2, 0x93, 0x73, 0xfc, 0xdf, 0x77, 0x48, 0xc9, 0xb2, 0xdd,
@ -1526,7 +1526,7 @@ const uint8_t PAGE_settings_um[] PROGMEM = {
// Autogenerated from wled00/data/settings_pin.htm, do not edit!!
const uint16_t PAGE_settings_pin_length = 549;
const uint8_t PAGE_settings_pin[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x53, 0x5d, 0x6f, 0xd3, 0x30,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x53, 0x5d, 0x6f, 0xd3, 0x30,
0x14, 0x7d, 0xcf, 0xaf, 0xf0, 0x8c, 0x34, 0xb5, 0x52, 0xdb, 0x8c, 0x09, 0x24, 0xc4, 0x92, 0x00,
0x85, 0x49, 0xec, 0x01, 0x56, 0xa9, 0xbc, 0xf0, 0x34, 0xb9, 0xf6, 0x4d, 0xe3, 0xd5, 0xb1, 0x23,
0xfb, 0xa6, 0xa1, 0x9b, 0xf8, 0xef, 0x5c, 0x27, 0xfd, 0xd8, 0x26, 0x21, 0xc1, 0x4b, 0x9c, 0x73,

File diff suppressed because it is too large Load Diff

View File

@ -477,7 +477,7 @@ void serializeInfo(JsonObject root)
if (strip.hasWhiteChannel()) leds[F("wv")] = true;
break;
}
/*
JsonArray leds_pin = leds.createNestedArray("pin");
for (uint8_t s=0; s<busses.getNumBusses(); s++) {
Bus *bus = busses.getBus(s);
@ -485,7 +485,7 @@ void serializeInfo(JsonObject root)
bus->getPins(pins);
leds_pin.add(pins[0]); // need to elaborate this for multipin strips
}
*/
leds[F("pwr")] = strip.currentMilliamps;
leds["fps"] = strip.getFps();
leds[F("maxpwr")] = (strip.currentMilliamps)? strip.ablMilliampsMax : 0;