diff --git a/package-lock.json b/package-lock.json
index 7462b5d8..42f12801 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "wled",
- "version": "0.10.2",
+ "version": "0.11.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -958,9 +958,9 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
"ini": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
- "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
},
"inliner": {
"version": "1.13.1",
diff --git a/package.json b/package.json
index 5d9ac9e4..ba3add2f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wled",
- "version": "0.11.0",
+ "version": "0.11.1",
"description": "Tools for WLED project",
"main": "tools/cdata.js",
"directories": {
diff --git a/platformio.ini b/platformio.ini
index 9d5ea9bc..7a8efcaf 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -179,7 +179,10 @@ extra_scripts = pio/name-firmware.py
framework = arduino
board_build.flash_mode = dout
monitor_speed = 115200
+# slow upload speed (comment this out with a ';' when building for development use)
upload_speed = 115200
+# fast upload speed (remove ';' when building for development use)
+; upload_speed = 921600
# ------------------------------------------------------------------------------
# LIBRARIES: required dependencies
@@ -361,6 +364,14 @@ board_build.ldscript = ${common.ldscript_4m1m}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp8266}
+[env:anavi_miracle_controller]
+board = d1_mini
+platform = ${common.platform_wled_default}
+platform_packages = ${common.platform_packages}
+board_build.ldscript = ${common.ldscript_4m1m}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags_esp8266} -D LEDPIN=12 -D IRPIN=-1 -D RLYPIN=2
+
# ------------------------------------------------------------------------------
# custom board configurations
# ------------------------------------------------------------------------------
diff --git a/tools/cdata.js b/tools/cdata.js
index aa473deb..34f37255 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -69,6 +69,8 @@ function writeHtmlGzipped(sourceFile, resultFile) {
console.info("Reading " + sourceFile);
new inliner(sourceFile, function (error, html) {
console.info("Inlined " + html.length + " characters");
+ html = filter(html, "html-minify-ui");
+ console.info("Minified to " + html.length + " characters");
if (error) {
console.warn(error);
@@ -123,6 +125,16 @@ function filter(str, type) {
continueOnParseError: false,
removeComments: true,
});
+ } else if (type == "html-minify-ui") {
+ return MinifyHTML(str, {
+ collapseWhitespace: true,
+ conservativeCollapse: true,
+ maxLineLength: 80,
+ minifyCSS: true,
+ minifyJS: true,
+ continueOnParseError: false,
+ removeComments: true,
+ });
} else {
console.warn("Unknown filter: " + type);
return str;
@@ -132,7 +144,7 @@ function filter(str, type) {
function specToChunk(srcDir, s) {
if (s.method == "plaintext") {
const buf = fs.readFileSync(srcDir + "/" + s.file);
- const str = buf.toString("ascii");
+ const str = buf.toString("utf-8");
const chunk = `
// Autogenerated from ${srcDir}/${s.file}, do not edit!!
const char ${s.name}[] PROGMEM = R"${s.prepend || ""}${filter(str, s.filter)}${
diff --git a/usermods/Fix_unreachable_netservices_v2/readme.md b/usermods/Fix_unreachable_netservices_v2/readme.md
index f7d2aed6..f7b721dd 100644
--- a/usermods/Fix_unreachable_netservices_v2/readme.md
+++ b/usermods/Fix_unreachable_netservices_v2/readme.md
@@ -1,17 +1,32 @@
# Fix unreachable net services V2
+**Attention: This usermod compiles only for ESP8266**
+
This usermod-v2 modification performs a ping request to the local IP address every 60 seconds. By this procedure the net services of WLED remains accessible in some problematic WLAN environments.
The modification works with static or DHCP IP address configuration.
-**Webinterface**: The number of pings and reconnects is displayed on the info page in the web interface.
-
_Story:_
Unfortunately, with all ESP projects where a web server or other network services are running, I have the problem that after some time the web server is no longer accessible. Now I found out that the connection is at least reestablished when a ping request is executed by the device.
With this modification, in the worst case, the network functions are not available for 60 seconds until the next ping request.
+## Webinterface
+
+The number of pings and reconnects is displayed on the info page in the web interface.
+The ping delay can be changed. Changes persist after a reboot.
+
+## JSON API
+
+The usermod supports the following state changes:
+
+| JSON key | Value range | Description |
+|-------------|------------------|---------------------------------|
+| PingDelayMs | 5000 to 18000000 | Deactivdate/activate the sensor |
+
+ Changes also persist after a reboot.
+
## Installation
1. Copy the file `usermod_Fix_unreachable_netservices.h` to the `wled00` directory.
diff --git a/usermods/Fix_unreachable_netservices_v2/usermod_Fix_unreachable_netservices.h b/usermods/Fix_unreachable_netservices_v2/usermod_Fix_unreachable_netservices.h
index 8ffc821e..cb2f1b0c 100644
--- a/usermods/Fix_unreachable_netservices_v2/usermod_Fix_unreachable_netservices.h
+++ b/usermods/Fix_unreachable_netservices_v2/usermod_Fix_unreachable_netservices.h
@@ -1,6 +1,14 @@
#pragma once
#include "wled.h"
+#if defined(ESP32)
+#warning "Usermod FixUnreachableNetServices works only with ESP8266 builds"
+class FixUnreachableNetServices : public Usermod
+{
+};
+#endif
+
+#if defined(ESP8266)
#include - + + + \ No newline at end of file diff --git a/wled00/data/index.js b/wled00/data/index.js new file mode 100644 index 00000000..f3fb72af --- /dev/null +++ b/wled00/data/index.js @@ -0,0 +1,1414 @@ +//page js +var loc = false, locip; +var noNewSegs = false; +var isOn = false, nlA = false, isLv = false, isInfo = false, syncSend = false, syncTglRecv = true, isRgbw = false; +var whites = [0,0,0]; +var expanded = [false]; +var powered = [true]; +var nlDur = 60, nlTar = 0; +var nlFade = false; +var selectedFx = 0; +var csel = 0; +var currentPreset = -1; +var lastUpdate = 0; +var segCount = 0, ledCount = 0, lowestUnused = 0, maxSeg = 0, lSeg = 0; +var pcMode = false, pcModeA = false, lastw = 0; +var d = document; +const ranges = RangeTouch.setup('input[type="range"]', {}); +var pJson = {}; +var pN = "", pI = 0; +var pmt = 1, pmtLS = 0, pmtLast = 0; +var lastinfo = {}; +var cfg = { + theme:{base:"dark", bg:{url:""}, alpha:{bg:0.6,tab:0.8}, color:{bg:""}}, + comp :{colors:{picker: true, rgb: false, quick: true, hex: false}, labels:true, pcmbot:false, pid:true} +}; + +var cpick = new iro.ColorPicker("#picker", { + width: 260, + wheelLightness: false, + wheelAngle: 90, + layout: [ + { + component: iro.ui.Wheel, + options: {} + }, + { + component: iro.ui.Slider, + options: { + sliderType: 'value' + } + }, + { + component: iro.ui.Slider, + options: { + sliderType: 'kelvin', + minTemperature: 2100, + maxTemperature: 10000 + } + } + ] +}); + +function handleVisibilityChange() { + if (!document.hidden && new Date () - lastUpdate > 3000) { + requestJson(null); + } +} + +function sCol(na, col) { + d.documentElement.style.setProperty(na, col); +} + +function applyCfg() +{ + cTheme(cfg.theme.base === "light"); + var bg = cfg.theme.color.bg; + if (bg) sCol('--c-1', bg); + var ccfg = cfg.comp.colors; + d.getElementById('hexw').style.display = ccfg.hex ? "block":"none"; + d.getElementById('picker').style.display = ccfg.picker ? "block":"none"; + d.getElementById('rgbwrap').style.display = ccfg.rgb ? "block":"none"; + d.getElementById('qcs-w').style.display = ccfg.quick ? "block":"none"; + var l = cfg.comp.labels; + var e = d.querySelectorAll('.tab-label'); + for (var i=0; i
`;
+ if (empty)
+ cn += `You have no presets yet!`;
+ else
+ cn += `Sorry, there was an issue loading your presets!`;
+
+ if (hasBackup) {
+ cn += `
`; + if (empty) + cn += `However, there is backup preset data of a previous installation available.
+ (Saving a preset will hide this and overwrite the backup)`; + else + cn += `Here is a backup of the last known good state:`; + cn += `
+ `; + } + cn += `
`;
+ d.getElementById('pcont').innerHTML = cn;
+ if (hasBackup) d.getElementById('bck').value = bckstr;
+}
+
+function loadPresets()
+{
+ var url = '/presets.json';
+ if (loc) {
+ url = `http://${locip}/presets.json`;
+ }
+
+ fetch
+ (url, {
+ method: 'get'
+ })
+ .then(res => {
+ if (!res.ok) {
+ showErrorToast();
+ }
+ return res.json();
+ })
+ .then(json => {
+ pJson = json;
+ populatePresets();
+ })
+ .catch(function (error) {
+ showToast(error, true);
+ console.log(error);
+ presetError(false);
+ });
+}
+
+var pQL = [];
+
+function populateQL()
+{
+ var cn = "";
+ if (pQL.length > 0) {
+ cn += ``; + if (empty) + cn += `However, there is backup preset data of a previous installation available.
+ (Saving a preset will hide this and overwrite the backup)`; + else + cn += `Here is a backup of the last known good state:`; + cn += `
+ `; + } + cn += `
Quick load
`; + + var it = 0; + for (var key of (pQL||[])) + { + cn += ``; + it++; + if (it > 4) { + it = 0; + cn += ''; + } + } + if (it != 0) cn+= '
'; + + cn += `
All presets
`; + } + d.getElementById('pql').innerHTML = cn; +} + +function populatePresets(fromls) +{ + if (fromls) pJson = JSON.parse(localStorage.getItem("wledP")); + delete pJson["0"]; + var cn = ""; + var arr = Object.entries(pJson); + arr.sort(cmpP); + var added = false; + pQL = []; + var is = []; + + for (var key of (arr||[])) + { + if (!isObject(key[1])) continue; + let i = parseInt(key[0]); + var qll = key[1].ql; + if (qll) pQL.push([i, qll]); + is.push(i); + + cn += ``;
+ if (cfg.comp.pid) cn += `
${i}
`;
+ cn += `${pName(i)}
+
+
+ `; + added = true; + } + + d.getElementById('pcont').innerHTML = cn; + if (added) { + if (pmtLS != pmt && pmt != 0) { + localStorage.setItem("wledPmt", pmt); + pJson["0"] = {}; + localStorage.setItem("wledP", JSON.stringify(pJson)); + } + pmtLS = pmt; + for (var a = 0; a < is.length; a++) { + let i = is[a]; + if (expanded[i+100]) expand(i+100, true); + } + } else { presetError(true); } + updatePA(); + populateQL(); +} + +function populateInfo(i) +{ + var cn=""; + var heap = i.freeheap/1000; + heap = heap.toFixed(1); + var pwr = i.leds.pwr; + var pwru = "Not calculated"; + if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";} + else if (pwr > 0) {pwr = 50 * Math.round(pwr/50); pwru = pwr + " mA";} + var urows=""; + if (i.u) { + for (var k = 0; k < i.u.length; k++) + { + var val = i.u[k]; + if (val[1]) { + urows += inforow(k,val[0],val[1]); + } else { + urows += inforow(k,val); + } + } + } + var vcn = "Kuuhaku"; + if (i.ver.startsWith("0.11.")) vcn = "Mirai"; + if (i.cn) vcn = i.cn; + + cn += `v${i.ver} "${vcn}"
+
+
+ Segment ${i}
+
+
+
+ `; + } + + d.getElementById('segcont').innerHTML = cn; + if (lowestUnused >= maxSeg) { + d.getElementById('segutil').innerHTML = 'Maximum number of segments reached.'; + noNewSegs = true; + } else if (noNewSegs) { + resetUtil(); + noNewSegs = false; + } + for (var i = 0; i <= lSeg; i++) { + updateLen(i); + updateTrail(d.getElementById(`seg${i}bri`)); + if (segCount < 2) d.getElementById(`segd${lSeg}`).style.display = "none"; + } + d.getElementById('rsbtn').style.display = (segCount > 1) ? "inline":"none"; +} + +function updateTrail(e, slidercol) +{ + if (e==null) return; + var max = e.hasAttribute('max') ? e.attributes.max.value : 255; + var progress = e.value * 100 / max; + progress = parseInt(progress); + var scol; + switch (slidercol) { + case 1: scol = "#f00"; break; + case 2: scol = "#0f0"; break; + case 3: scol = "#00f"; break; + default: scol = "var(--c-f)"; + } + var val = `linear-gradient(90deg, ${scol} ${progress}%, var(--c-4) ${progress}%)`; + e.parentNode.getElementsByClassName('sliderdisplay')[0].style.background = val; +} + +function updateBubble(e) +{ + var bubble = e.target.parentNode.getElementsByTagName('output')[0]; + + if (bubble) { + bubble.innerHTML = e.target.value; + } +} + +function toggleBubble(e) +{ + e.target.parentNode.querySelector('output').classList.toggle('hidden'); +} + +function updateLen(s) +{ + if (!d.getElementById(`seg${s}s`)) return; + var start = parseInt(d.getElementById(`seg${s}s`).value); + var stop = parseInt(d.getElementById(`seg${s}e`).value); + var len = stop - start; + var out = "(delete)"; + if (len > 1) { + out = `${len} LEDs`; + } else if (len == 1) { + out = "1 LED"; + } + + if (d.getElementById(`seg${s}grp`) != null) + { + var grp = parseInt(d.getElementById(`seg${s}grp`).value); + var spc = parseInt(d.getElementById(`seg${s}spc`).value); + if (grp == 0) grp = 1; + var virt = Math.ceil(len/(grp + spc)); + if (!isNaN(virt) && (grp > 1 || spc > 0)) out += ` (${virt} virtual)`; + } + + d.getElementById(`seg${s}len`).innerHTML = out; +} + +function updatePA() +{ + var ps = d.getElementsByClassName("seg"); + for (let i = 0; i < ps.length; i++) { + ps[i].style.backgroundColor = "var(--c-2)"; + } + ps = d.getElementsByClassName("psts"); + for (let i = 0; i < ps.length; i++) { + ps[i].style.backgroundColor = "var(--c-2)"; + } + if (currentPreset > 0) { + var acv = d.getElementById(`p${currentPreset}o`); + if (acv && !expanded[currentPreset+100]) + acv.style.background = "var(--c-6)"; + acv = d.getElementById(`p${currentPreset}qlb`); + if (acv) acv.style.background = "var(--c-6)"; + } +} + +function updateUI() +{ + d.getElementById('buttonPower').className = (isOn) ? "active":""; + d.getElementById('buttonNl').className = (nlA) ? "active":""; + d.getElementById('buttonSync').className = (syncSend) ? "active":""; + + d.getElementById('fxb' + selectedFx).style.backgroundColor = "var(--c-6)"; + updateTrail(d.getElementById('sliderBri')); + updateTrail(d.getElementById('sliderSpeed')); + updateTrail(d.getElementById('sliderIntensity')); + updateTrail(d.getElementById('sliderW')); + if (isRgbw) d.getElementById('wwrap').style.display = "block"; + + var spal = d.getElementById("selectPalette"); + spal.style.backgroundColor = (spal.selectedIndex > 0) ? "var(--c-6)":"var(--c-3)"; + updatePA(); + updateHex(); + updateRgb(); +} + +function displayRover(i,s) +{ + d.getElementById('rover').style.transform = (i.live && s.lor == 0) ? "translateY(0px)":"translateY(100%)"; + var sour = i.lip ? i.lip:""; if (sour.length > 2) sour = " from " + sour; + d.getElementById('lv').innerHTML = `WLED is receiving live ${i.lm} data${sour}`; + d.getElementById('roverstar').style.display = (i.live && s.lor) ? "block":"none"; +} + +function compare(a, b) { + if (a.name < b.name) return -1; + return 1; +} +function cmpP(a, b) { + if (!a[1].n) return (a[0] > b[0]); + return a[1].n.localeCompare(b[1].n,undefined, {numeric: true}); +} + +var jsonTimeout; +function requestJson(command, rinfo = true, verbose = true) { + d.getElementById('connind').style.backgroundColor = "#a90"; + lastUpdate = new Date(); + if (!jsonTimeout) jsonTimeout = setTimeout(showErrorToast, 3000); + var req = null; + var e1 = d.getElementById('fxlist'); + var e2 = d.getElementById('selectPalette'); + + var url = rinfo ? '/json/si': (command ? '/json/state':'/json'); + if (loc) { + url = `http://${locip}${url}`; + } + + var type = command ? 'post':'get'; + if (command) + { + command.v = verbose; + command.time = Math.floor(Date.now() / 1000); + req = JSON.stringify(command); + //console.log(req); + } + fetch + (url, { + method: type, + headers: { + "Content-type": "application/json; charset=UTF-8" + }, + body: req + }) + .then(res => { + if (!res.ok) { + showErrorToast(); + } + return res.json(); + }) + .then(json => { + clearTimeout(jsonTimeout); + jsonTimeout = null; + clearErrorToast(); + d.getElementById('connind').style.backgroundColor = "#070"; + if (!json) showToast('Empty response', true); + if (json.success) return; + var s = json; + if (!command || rinfo) { + if (!rinfo) { + pmt = json.info.fs.pmt; + if (pmt != pmtLS || pmt == 0) { + setTimeout(loadPresets,99); + } + else populatePresets(true); + pmtLast = pmt; + var x='',y=''; + json.effects.shift(); //remove solid + for (let i = 0; i < json.effects.length; i++) json.effects[i] = {id: parseInt(i)+1, name:json.effects[i]}; + json.effects.sort(compare); + for (let i = 0; i < json.effects.length; i++) { + x += `
`; + } + + json.palettes.shift(); //remove default + for (let i = 0; i < json.palettes.length; i++) json.palettes[i] = {"id": parseInt(i)+1, "name":json.palettes[i]}; + json.palettes.sort(compare); + for (let i = 0; i < json.palettes.length; i++) { + y += ``; + } + e1.innerHTML=x; e2.innerHTML=y; + } + + var info = json.info; + var name = info.name; + d.getElementById('namelabel').innerHTML = name; + if (name === "Dinnerbone") d.documentElement.style.transform = "rotate(180deg)"; + if (info.live) name = "(Live) " + name; + if (loc) name = "(L) " + name; + d.title = name; + isRgbw = info.leds.wv; + ledCount = info.leds.count; + syncTglRecv = info.str; + maxSeg = info.leds.maxseg; + pmt = info.fs.pmt; + if (!command && pmt != pmtLast) setTimeout(loadPresets,99); + pmtLast = pmt; + lastinfo = info; + if (isInfo) populateInfo(info); + s = json.state; + displayRover(info, s); + } + isOn = s.on; + d.getElementById('sliderBri').value= s.bri; + nlA = s.nl.on; + nlDur = s.nl.dur; + nlTar = s.nl.tbri; + nlFade = s.nl.fade; + syncSend = s.udpn.send; + currentPreset = s.ps; + d.getElementById('cyToggle').checked = (s.pl < 0) ? false : true; + d.getElementById('cycs').value = s.ccnf.min; + d.getElementById('cyce').value = s.ccnf.max; + d.getElementById('cyct').value = s.ccnf.time /10; + d.getElementById('cyctt').value = s.transition /10; + + var selc=0; var ind=0; + populateSegments(s); + for (let i = 0; i < (s.seg||[]).length; i++) + { + if(s.seg[i].sel) {selc = ind; break;} ind++; + } + var i=s.seg[selc]; + if (!i) { + showToast('No Segments!', true); + updateUI(); + return; + } + var cd = d.getElementById('csl').children; + for (let e = 2; e >= 0; e--) + { + cd[e].style.backgroundColor = "rgb(" + i.col[e][0] + "," + i.col[e][1] + "," + i.col[e][2] + ")"; + if (isRgbw) whites[e] = parseInt(i.col[e][3]); + selectSlot(csel); + } + d.getElementById('sliderSpeed').value = whites[csel]; + + d.getElementById('sliderSpeed').value = i.sx; + d.getElementById('sliderIntensity').value = i.ix; + + d.getElementById('fxb' + selectedFx).style.backgroundColor = "var(--c-3)"; + selectedFx = i.fx; + e2.value = i.pal; + if (!command) d.getElementById('Effects').scrollTop = d.getElementById('fxb' + selectedFx).offsetTop - d.getElementById('Effects').clientHeight/1.8; + + if (s.error && s.error != 0) { + var errstr = ""; + switch (s.error) { + case 10: errstr = "Could not mount filesystem!"; break; + case 11: errstr = "Not enough space to save preset!"; break; + case 12: errstr = "The requested preset does not exist."; break; + case 19: errstr = "A filesystem error has occured."; break; + } + showToast('Error ' + s.error + ": " + errstr, true); + } + updateUI(); + }) + .catch(function (error) { + showToast(error, true); + console.log(error); + }); +} + +function togglePower() { + isOn = !isOn; + var obj = {"on": isOn}; + obj.transition = parseInt(d.getElementById('cyctt').value*10); + requestJson(obj); +} + +function toggleNl() { + nlA = !nlA; + if (nlA) + { + showToast(`Timer active. Your light will turn ${nlTar > 0 ? "on":"off"} ${nlFade ? "over":"after"} ${nlDur} minutes.`); + } else { + showToast('Timer deactivated.'); + } + var obj = {"nl": {"on": nlA}}; + requestJson(obj); +} + +function toggleSync() { + syncSend = !syncSend; + if (syncSend) + { + showToast('Other lights in the network will now sync to this one.'); + } else { + showToast('This light and other lights in the network will no longer sync.'); + } + var obj = {"udpn": {"send": syncSend}}; + if (syncTglRecv) obj.udpn.recv = syncSend; + requestJson(obj); +} + +function toggleLiveview() { + isLv = !isLv; + d.getElementById('liveview').style.display = (isLv) ? "block":"none"; + var url = loc ? `http://${locip}/liveview`:"/liveview"; + d.getElementById('liveview').src = (isLv) ? url:"about:blank"; + d.getElementById('buttonSr').className = (isLv) ? "active":""; + size(); +} + +function toggleInfo() { + isInfo = !isInfo; + if (isInfo) populateInfo(lastinfo); + d.getElementById('info').style.transform = (isInfo) ? "translateY(0px)":"translateY(100%)"; + d.getElementById('buttonI').className = (isInfo) ? "active":""; +} + +function makeSeg() { + var ns = 0; + if (lowestUnused > 0) { + var pend = d.getElementById(`seg${lowestUnused -1}e`).value; + if (pend < ledCount) ns = pend; + } + var cn = `
+
+ +
`;
+ d.getElementById('segutil').innerHTML = cn;
+}
+
+function resetUtil() {
+ var cn = `
+ New segment ${lowestUnused}
+
+ + +
`; + d.getElementById('segutil').innerHTML = cn; +} + +function makeP(i) { + return ` +
+
Quick load label:
+ (leave empty for no Quick load button)
+ +
+ API command
+ +
+ + +
+
+
+
+ Save to ID 0)?i:getLowestUnusedP()}>
+
+
+ ${(i>0)?'':
+ ''}
+
+
+
+
+ ${(i>0)? ('ID ' +i+ '
'):""}`;
+}
+
+function makePUtil() {
+ d.getElementById('putil').innerHTML = `
+
`;
+ updateTrail(d.getElementById('p0p'));
+}
+
+function resetPUtil() {
+ var cn = `
+ New preset
+ `; + d.getElementById('putil').innerHTML = cn; +} + +function tglCs(i){ + var pss = d.getElementById(`p${i}cstgl`).checked; + d.getElementById(`p${i}o1`).style.display = pss? "block" : "none"; + d.getElementById(`p${i}o2`).style.display = !pss? "block" : "none"; +} + +function selSegEx(s) +{ + var obj = {"seg":[]}; + for (let i=0; i<=lSeg; i++){ + obj.seg.push({"sel":(i==s)?true:false}); + } + requestJson(obj); +} + +function selSeg(s){ + var sel = d.getElementById(`seg${s}sel`).checked; + var obj = {"seg": {"id": s, "sel": sel}}; + requestJson(obj, false); +} + +function setSeg(s){ + var start = parseInt(d.getElementById(`seg${s}s`).value); + var stop = parseInt(d.getElementById(`seg${s}e`).value); + if (stop <= start) {delSeg(s); return;} + var obj = {"seg": {"id": s, "start": start, "stop": stop}}; + if (d.getElementById(`seg${s}grp`)) + { + var grp = parseInt(d.getElementById(`seg${s}grp`).value); + var spc = parseInt(d.getElementById(`seg${s}spc`).value); + obj.seg.grp = grp; + obj.seg.spc = spc; + } + requestJson(obj); +} + +function delSeg(s){ + if (segCount < 2) { + showToast("You need to have multiple segments to delete one!"); + return; + } + expanded[s] = false; + segCount--; + var obj = {"seg": {"id": s, "stop": 0}}; + requestJson(obj, false); +} + +function setRev(s){ + var rev = d.getElementById(`seg${s}rev`).checked; + var obj = {"seg": {"id": s, "rev": rev}}; + requestJson(obj, false); +} + +function setMi(s){ + var mi = d.getElementById(`seg${s}mi`).checked; + var obj = {"seg": {"id": s, "mi": mi}}; + requestJson(obj, false); +} + +function setSegPwr(s){ + var obj = {"seg": {"id": s, "on": !powered[s]}}; + requestJson(obj); +} + +function setSegBri(s){ + var obj = {"seg": {"id": s, "bri": parseInt(d.getElementById(`seg${s}bri`).value)}}; + requestJson(obj); +} + +function setX(ind) { + var obj = {"seg": {"fx": parseInt(ind)}}; + requestJson(obj); +} + +function setPalette() +{ + var obj = {"seg": {"pal": parseInt(d.getElementById('selectPalette').value)}}; + requestJson(obj); +} + +function setBri() { + var obj = {"bri": parseInt(d.getElementById('sliderBri').value)}; + obj.transition = parseInt(d.getElementById('cyctt').value*10); + requestJson(obj); +} + +function setSpeed() { + var obj = {"seg": {"sx": parseInt(d.getElementById('sliderSpeed').value)}}; + requestJson(obj, false); +} + +function setIntensity() { + var obj = {"seg": {"ix": parseInt(d.getElementById('sliderIntensity').value)}}; + requestJson(obj, false); +} + +function setLor(i) { + var obj = {"lor": i}; + requestJson(obj); +} + +function toggleCY() { + var obj = {"pl" : -1}; + if (d.getElementById('cyToggle').checked) + { + obj = {"pl": 0, "ccnf": {"min": parseInt(d.getElementById('cycs').value), "max": parseInt(d.getElementById('cyce').value), "time": parseInt(d.getElementById('cyct').value*10)}}; + obj.transition = parseInt(d.getElementById('cyctt').value*10); + } + + requestJson(obj); +} + +function setPreset(i) { + var obj = {"ps": i}; + + showToast("Loading preset " + pName(i) +" (" + i + ")"); + + requestJson(obj); +} + +function saveP(i) { + pI = parseInt(d.getElementById(`p${i}id`).value); + if (!pI || pI < 1) pI = (i>0) ? i : getLowestUnusedP(); + pN = d.getElementById(`p${i}txt`).value; + if (pN == "") pN = "Preset " + pI; + var obj = {}; + if (!d.getElementById(`p${i}cstgl`).checked) { + var raw = d.getElementById(`p${i}api`).value; + try { + obj = JSON.parse(raw); + } catch (e) { + obj.win = raw; + if (raw.length < 2) { + d.getElementById(`p${i}warn`).innerHTML = "⚠ Please enter your API command first"; + return; + } else if (raw.indexOf('{') > -1) { + d.getElementById(`p${i}warn`).innerHTML = "⚠ Syntax error in custom JSON API command"; + return; + } else if (raw.indexOf("Please") == 0) { + d.getElementById(`p${i}warn`).innerHTML = "⚠ Please refresh the page before modifying this preset"; + return; + } + } + obj.o = true; + } else { + obj.ib = d.getElementById(`p${i}ibtgl`).checked; + obj.sb = d.getElementById(`p${i}sbtgl`).checked; + } + obj.psave = pI; obj.n = pN; + var pQN = d.getElementById(`p${i}ql`).value; + if (pQN.length > 0) obj.ql = pQN; + + showToast("Saving " + pN +" (" + pI + ")"); + requestJson(obj); + if (obj.o) { + pJson[pI] = obj; + delete pJson[pI].psave; + delete pJson[pI].o; + delete pJson[pI].v; + delete pJson[pI].time; + } else { + pJson[pI] = {"n":pN, "win":"Please refresh the page to see this newly saved command."}; + if (obj.win) pJson[pI].win = obj.win; + if (obj.ql) pJson[pI].ql = obj.ql; + } + populatePresets(); + resetPUtil(); +} + +function delP(i) { + var obj = {"pdel": i}; + requestJson(obj); + delete pJson[i]; + populatePresets(); +} + +function selectSlot(b) { + csel = b; + var cd = d.getElementById('csl').children; + for (let i = 0; i < cd.length; i++) { + cd[i].style.border="2px solid white"; + cd[i].style.margin="5px"; + cd[i].style.width="42px"; + } + cd[csel].style.border="5px solid white"; + cd[csel].style.margin="2px"; + cd[csel].style.width="50px"; + cpick.color.set(cd[csel].style.backgroundColor); + d.getElementById('sliderW').value = whites[csel]; + updateTrail(d.getElementById('sliderW')); + updateHex(); + updateRgb(); +} + +var lasth = 0; +function pC(col) +{ + if (col == "rnd") + { + col = {h: 0, s: 0, v: 100}; + col.s = Math.floor((Math.random() * 50) + 50); + do { + col.h = Math.floor(Math.random() * 360); + } while (Math.abs(col.h - lasth) < 50); + lasth = col.h; + } + cpick.color.set(col); + setColor(0); +} + +function updateRgb() +{ + var col = cpick.color.rgb; + var s = d.getElementById('sliderR'); + s.value = col.r; updateTrail(s,1); + s = d.getElementById('sliderG'); + s.value = col.g; updateTrail(s,2); + s = d.getElementById('sliderB'); + s.value = col.b; updateTrail(s,3); +} + +function updateHex() +{ + var str = cpick.color.hexString; + str = str.substring(1); + var w = whites[csel]; + if (w > 0) str += w.toString(16); + d.getElementById('hexc').value = str; + d.getElementById('hexcnf').style.backgroundColor = "var(--c-3)"; +} + +function hexEnter() { + d.getElementById('hexcnf').style.backgroundColor = "var(--c-6)"; + if(event.keyCode == 13) fromHex(); +} + +function fromHex() +{ + var str = d.getElementById('hexc').value; + whites[csel] = parseInt(str.substring(6), 16); + try { + cpick.color.set("#" + str.substring(0,6)); + } catch (e) { + cpick.color.set("#ffaa00"); + } + if (isNaN(whites[csel])) whites[csel] = 0; + setColor(2); +} + +function fromRgb() +{ + var r = d.getElementById('sliderR').value; + var g = d.getElementById('sliderG').value; + var b = d.getElementById('sliderB').value; + cpick.color.set(`rgb(${r},${g},${b})`); + setColor(0); +} + +function setColor(sr) { + var cd = d.getElementById('csl').children; + if (sr == 1 && cd[csel].style.backgroundColor == 'rgb(0, 0, 0)') cpick.color.setChannel('hsv', 'v', 100); + cd[csel].style.backgroundColor = cpick.color.rgbString; + if (sr != 2) whites[csel] = d.getElementById('sliderW').value; + var col = cpick.color.rgb; + var obj = {"seg": {"col": [[col.r, col.g, col.b, whites[csel]],[],[]]}}; + if (csel == 1) { + obj = {"seg": {"col": [[],[col.r, col.g, col.b, whites[csel]],[]]}}; + } else if (csel == 2) { + obj = {"seg": {"col": [[],[],[col.r, col.g, col.b, whites[csel]]]}}; + } + updateHex(); + updateRgb(); + obj.transition = parseInt(d.getElementById('cyctt').value*10); + requestJson(obj); +} + +var hc = 0; +setInterval(function(){if (!isInfo) return; hc+=18; if (hc>300) hc=0; if (hc>200)hc=306; if (hc==144) hc+=36; if (hc==108) hc+=18; +d.getElementById('heart').style.color = `hsl(${hc}, 100%, 50%)`;}, 910); + +function openGH() +{ + window.open("https://github.com/Aircoookie/WLED/wiki"); +} + +var cnfr = false; +function cnfReset() +{ + if (!cnfr) + { + var bt = d.getElementById('resetbtn'); + bt.style.color = "#f00"; + bt.innerHTML = "Confirm Reboot"; + cnfr = true; return; + } + window.location.href = "/reset"; +} + +var cnfrS = false; +function rSegs() +{ + var bt = d.getElementById('rsbtn'); + if (!cnfrS) + { + bt.style.color = "#f00"; + bt.innerHTML = "Confirm reset"; + cnfrS = true; return; + } + cnfrS = false; + bt.style.color = "#fff"; + bt.innerHTML = "Reset segments"; + var obj = {"seg":[{"start":0,"stop":ledCount,"sel":true}]}; + for (let i=1; i<=lSeg; i++){ + obj.seg.push({"stop":0}); + } + requestJson(obj); +} + +function expand(i,a) +{ + if (!a) expanded[i] = !expanded[i]; + d.getElementById('seg' +i).style.display = (expanded[i]) ? "block":"none"; + d.getElementById('sege' +i).style.transform = (expanded[i]) ? "rotate(180deg)":"rotate(0deg)"; + if (i > 100) { //presets + var p = i-100; + d.getElementById(`p${p}o`).style.background = (expanded[i] || p != currentPreset)?"var(--c-2)":"var(--c-6)"; + if (d.getElementById('seg' +i).innerHTML == "") { + d.getElementById('seg' +i).innerHTML = makeP(p); + var papi = papiVal(p); + d.getElementById(`p${p}api`).value = papi; + if (papi.indexOf("Please") == 0) d.getElementById(`p${p}cstgl`).checked = true; + tglCs(p); + } + } +} + +function unfocusSliders() { + d.getElementById("sliderBri").blur(); + d.getElementById("sliderSpeed").blur(); + d.getElementById("sliderIntensity").blur(); +} + +//sliding UI +const _C = document.querySelector('.container'), N = 4; + +let iSlide = 0, x0 = null, scrollS = 0, locked = false, w; + +function unify(e) { return e.changedTouches ? e.changedTouches[0] : e; } + +function hasIroClass(classList) { + for (var i = 0; i < classList.length; i++) { + var element = classList[i]; + if (element.startsWith('Iro')) return true; + } + + return false; +} + + +function lock(e) { + if (pcMode) return; + var l = e.target.classList; + var pl = e.target.parentElement.classList; + + if (l.contains('noslide') || hasIroClass(l) || hasIroClass(pl)) return; + + x0 = unify(e).clientX; + scrollS = d.getElementsByClassName("tabcontent")[iSlide].scrollTop; + + _C.classList.toggle('smooth', !(locked = true)); +} + +function move(e) { + if(!locked || pcMode) return; + var dx = unify(e).clientX - x0, s = Math.sign(dx), + f = +(s*dx/w).toFixed(2); + + if((iSlide > 0 || s < 0) && (iSlide < N - 1 || s > 0) && + f > 0.12 && + d.getElementsByClassName("tabcontent")[iSlide].scrollTop == scrollS) { + _C.style.setProperty('--i', iSlide -= s); + f = 1 - f; + updateTablinks(iSlide); + } + _C.style.setProperty('--f', f); + _C.classList.toggle('smooth', !(locked = false)); + x0 = null; +} + +function size() { + w = window.innerWidth; + var h = d.getElementById('top').clientHeight; + sCol('--th', h + "px"); + sCol('--bh', d.getElementById('bot').clientHeight + "px"); + if (isLv) h -= 4; + sCol('--tp', h + "px"); + togglePcMode(); +} + +function togglePcMode(fromB = false) +{ + if (fromB) { + pcModeA = !pcModeA; + localStorage.setItem('pcm', pcModeA); + pcMode = pcModeA; + } + if (w < 1250 && !pcMode) return; + if (!fromB && ((w < 1250 && lastw < 1250) || (w >= 1250 && lastw >= 1250))) return; + openTab(0, true); + if (w < 1250) {pcMode = false;} + else if (pcModeA && !fromB) pcMode = pcModeA; + updateTablinks(0); + d.getElementById('buttonPcm').className = (pcMode) ? "active":""; + d.getElementById('bot').style.height = (pcMode && !cfg.comp.pcmbot) ? "0":"auto"; + sCol('--bh', d.getElementById('bot').clientHeight + "px"); + _C.style.width = (pcMode)?'100%':'400%'; + lastw = w; +} + +function isObject(item) { + return (item && typeof item === 'object' && !Array.isArray(item)); +} + +function mergeDeep(target, ...sources) { + if (!sources.length) return target; + const source = sources.shift(); + + if (isObject(target) && isObject(source)) { + for (const key in source) { + if (isObject(source[key])) { + if (!target[key]) Object.assign(target, { [key]: {} }); + mergeDeep(target[key], source[key]); + } else { + Object.assign(target, { [key]: source[key] }); + } + } + } + return mergeDeep(target, ...sources); +} + +size(); +_C.style.setProperty('--n', N); + +window.addEventListener('resize', size, false); + +_C.addEventListener('mousedown', lock, false); +_C.addEventListener('touchstart', lock, false); + +_C.addEventListener('mouseout', move, false); +_C.addEventListener('mouseup', move, false); +_C.addEventListener('touchend', move, false); \ No newline at end of file diff --git a/wled00/data/iro.js b/wled00/data/iro.js new file mode 100644 index 00000000..f459e417 --- /dev/null +++ b/wled00/data/iro.js @@ -0,0 +1,7 @@ +/*! + * iro.js v5.3.1 + * 2016-2020 James Daniel + * Licensed under MPL 2.0 + * github.com/jaames/iro.js + */ +!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(t=t||self).iro=n()}(this,function(){"use strict";var k,s,n,i,o,m={},M=[],r=/acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|^--/i;function j(t,n){for(var i in n)t[i]=n[i];return t}function b(t){var n=t.parentNode;n&&n.removeChild(t)}function d(t,n,i){var r,e,u,o,l=arguments;if(n=j({},n),3
WLED Software Update
Installed version: ##VERSION##Download the latest binary:
- +
WLED Software Update
+ +Updating...
Please do not close or refresh the page :)
\ No newline at end of file
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index bbf228d8..d52d5edf 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -15,7 +15,7 @@ void handleAlexa();
void onAlexaChange(EspalexaDevice* dev);
//blynk.cpp
-void initBlynk(const char* auth);
+void initBlynk(const char* auth, const char* host, uint16_t port);
void handleBlynk();
void updateBlynk();
@@ -240,6 +240,7 @@ void userLoop();
void applyMacro(byte index);
void deEEP();
void deEEPSettings();
+void clearEEPROM();
//wled_serial.cpp
void handleSerial();
diff --git a/wled00/html_other.h b/wled00/html_other.h
index 1e51b213..9011bccd 100644
--- a/wled00/html_other.h
+++ b/wled00/html_other.h
@@ -36,17 +36,19 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
// Autogenerated from wled00/data/update.htm, do not edit!!
const char PAGE_update[] PROGMEM = R"=====(
-Please do not close or refresh the page :)
WLED Software Update
Installed version: 0.11.0-Download the latest binary: WLED Update
WLED Software Update
)====="; ++
Updating...
+
Please do not close or refresh the page :)
)=====";
// Autogenerated from wled00/data/welcome.htm, do not edit!!
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 23b840ca..d6d72cb1 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -10,9 +10,9 @@ const char PAGE_settingsCss[] PROGMEM = R"=====(Please do not close or refresh the page :)