diff --git a/wled00/data/index.js b/wled00/data/index.js
index 2c788f2d..26b47c7e 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -9,6 +9,7 @@ var powered = [true];
var nlDur = 60, nlTar = 0;
var nlMode = false;
var selectedFx = 0;
+var selectedPal = 0;
var csel = 0;
var currentPreset = -1;
var lastUpdate = 0;
@@ -18,12 +19,11 @@ var tr = 7;
var d = document;
const ranges = RangeTouch.setup('input[type="range"]', {});
var palettesData;
-var pJson = {};
+var pJson = {}, eJson = {}, lJson = {};
var pN = "", pI = 0, pNum = 0;
var pmt = 1, pmtLS = 0, pmtLast = 0;
var lastinfo = {};
var ws;
-var fxlist = d.getElementById('fxlist'), pallist = d.getElementById('pallist');
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},
@@ -40,17 +40,15 @@ var hol = [
var cpick = new iro.ColorPicker("#picker", {
width: 260,
wheelLightness: false,
- wheelAngle: 90,
- layout: [
+ wheelAngle: 90,
+ layout: [
{
component: iro.ui.Wheel,
options: {}
},
{
component: iro.ui.Slider,
- options: {
- sliderType: 'value'
- }
+ options: { sliderType: 'value' }
},
{
component: iro.ui.Slider,
@@ -63,15 +61,10 @@ var cpick = new iro.ColorPicker("#picker", {
]
});
-function handleVisibilityChange() {
- if (!d.hidden && new Date () - lastUpdate > 3000) {
- requestJson(null);
- }
-}
-
-function sCol(na, col) {
- d.documentElement.style.setProperty(na, col);
-}
+function handleVisibilityChange() {if (!d.hidden && new Date () - lastUpdate > 3000) requestJson();}
+function sCol(na, col) {d.documentElement.style.setProperty(na, col);}
+function gId(c) {return d.getElementById(c);}
+function gEBCN(c) {return d.getElementsByClassName(c);}
function applyCfg()
{
@@ -79,14 +72,13 @@ function applyCfg()
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";
+ gId('hexw').style.display = ccfg.hex ? "block":"none";
+ gId('picker').style.display = ccfg.picker ? "block":"none";
+ gId('rgbwrap').style.display = ccfg.rgb ? "block":"none";
+ gId('qcs-w').style.display = ccfg.quick ? "block":"none";
var l = cfg.comp.labels;
var e = d.querySelectorAll('.tab-label');
- for (var i=0; i
{
+ loadPalettesData(redrawPalPrev);
+ loadFX(()=>{
+ loadPresets(()=>{
+ loadInfo(requestJson);
+ });
+ });
+ });
+ resetUtil();
+ updateUI(true);
+
d.addEventListener("visibilitychange", handleVisibilityChange, false);
size();
- d.getElementById("cv").style.opacity=0;
+ gId("cv").style.opacity=0;
if (localStorage.getItem('pcm') == "true") togglePcMode(true);
var sls = d.querySelectorAll('input[type="range"]');
for (var sl of sls) {
- sl.addEventListener('input', updateBubble, true);
+ //sl.addEventListener('input', updateBubble, true);
sl.addEventListener('touchstart', toggleBubble);
sl.addEventListener('touchend', toggleBubble);
}
@@ -262,15 +269,14 @@ function onLoad() {
function updateTablinks(tabI)
{
- var tablinks = d.getElementsByClassName("tablinks");
- for (var i of tablinks) {
- i.className = i.className.replace(" active", "");
- }
+ var tablinks = gEBCN("tablinks");
+ for (var i of tablinks) i.className = i.className.replace(" active", "");
if (pcMode) return;
tablinks[tabI].className += " active";
}
-function openTab(tabI, force = false) {
+function openTab(tabI, force = false)
+{
if (pcMode && !force) return;
iSlide = tabI;
_C.classList.toggle('smooth', false);
@@ -279,23 +285,30 @@ function openTab(tabI, force = false) {
}
var timeout;
-function showToast(text, error = false) {
- if (error) d.getElementById('connind').style.backgroundColor = "#831";
- var x = d.getElementById("toast");
+function showToast(text, error = false)
+{
+ if (error) gId('connind').style.backgroundColor = "var(--c-r)";
+ var x = gId("toast");
x.innerHTML = text;
x.className = error ? "error":"show";
clearTimeout(timeout);
x.style.animation = 'none';
- x.style.animation = null;
timeout = setTimeout(function(){ x.className = x.className.replace("show", ""); }, 2900);
+ if (error) console.log(text);
}
-function showErrorToast() {
+function showErrorToast()
+{
+ if (ws && ws.readyState === WebSocket.OPEN) {
+ // if we received a timeout force WS reconnect
+ ws.close();
+ ws = null;
+ if (lastinfo.ws > -1) setTimeout(makeWS,500);
+ }
showToast('Connection to light failed!', true);
}
-function clearErrorToast() {
- d.getElementById("toast").className = d.getElementById("toast").className.replace("error", "");
-}
+
+function clearErrorToast() {gId("toast").className = gId("toast").className.replace("error", "");}
function getRuntimeStr(rt)
{
@@ -320,54 +333,54 @@ function inforow(key, val, unit = "")
function getLowestUnusedP()
{
var l = 1;
- for (var key in pJson)
- {
- if (key == l) l++;
- }
- if (l > 250) l = 250;
+ for (var key in pJson) if (key == l) l++;
+ if (l > 250) l = 250;
return l;
}
-function checkUsed(i) {
- var id = d.getElementById(`p${i}id`).value;
- if (pJson[id] && (i == 0 || id != i)) {
- d.getElementById(`p${i}warn`).innerHTML = `⚠ Overwriting ${pName(id)}!`;
- } else {
- d.getElementById(`p${i}warn`).innerHTML = "";
- }
+function checkUsed(i)
+{
+ var id = gId(`p${i}id`).value;
+ if (pJson[id] && (i == 0 || id != i))
+ gId(`p${i}warn`).innerHTML = `⚠ Overwriting ${pName(id)}!`;
+ else
+ gId(`p${i}warn`).innerHTML = "";
}
-function pName(i) {
+function pName(i)
+{
var n = "Preset " + i;
- if (pJson[i].n) n = pJson[i].n;
+ if (pJson && pJson[i] && pJson[i].n) n = pJson[i].n;
return n;
}
-function isPlaylist(i) {
+function isPlaylist(i)
+{
return pJson[i].playlist && pJson[i].playlist.ps;
}
-function papiVal(i) {
- if (!pJson[i]) return "";
+function papiVal(i)
+{
+ if (!pJson || !pJson[i]) return "";
var o = Object.assign({},pJson[i]);
if (o.win) return o.win;
delete o.n; delete o.p; delete o.ql;
return JSON.stringify(o);
}
-function qlName(i) {
- if (!pJson[i]) return "";
- if (!pJson[i].ql) return "";
- return pJson[i].ql;
+function qlName(i)
+{
+ if (!pJson || !pJson[i] || !pJson[i].ql) return "";
+ return pJson[i].ql;
}
-function cpBck() {
- var copyText = d.getElementById("bck");
+function cpBck()
+{
+ var copyText = gId("bck");
- copyText.select();
- copyText.setSelectionRange(0, 999999);
- d.execCommand("copy");
-
+ copyText.select();
+ copyText.setSelectionRange(0, 999999);
+ d.execCommand("copy");
showToast("Copied to clipboard!");
}
@@ -377,9 +390,8 @@ function presetError(empty)
try {
bckstr = localStorage.getItem("wledP");
if (bckstr.length > 10) hasBackup = true;
- } catch (e) {
+ } catch (e) {}
- }
var cn = ``;
if (empty)
cn += `You have no presets yet!`;
@@ -397,8 +409,8 @@ function presetError(empty)
`;
}
cn += `
`;
- d.getElementById('pcont').innerHTML = cn;
- if (hasBackup) d.getElementById('bck').value = bckstr;
+ gId('pcont').innerHTML = cn;
+ if (hasBackup) gId('bck').value = bckstr;
}
function loadPresets(callback = null)
@@ -417,22 +429,17 @@ function loadPresets(callback = null)
pmtLast = pmt;
- var url = '/presets.json';
- if (loc) {
- url = `http://${locip}/presets.json`;
- }
+ var url = (loc?`http://${locip}`:'') + '/presets.json';
- fetch
- (url, {
+ fetch(url, {
method: 'get'
})
.then(res => {
- if (!res.ok) {
- showErrorToast();
- }
+ if (!res.ok) showErrorToast();
return res.json();
})
.then(json => {
+ clearErrorToast();
pJson = json;
populatePresets();
})
@@ -441,82 +448,164 @@ function loadPresets(callback = null)
console.log(error);
presetError(false);
})
- .finally(() => {
+ .finally(()=>{
if (callback) setTimeout(callback,99);
});
}
-var pQL = [];
+function loadPalettes(callback = null)
+{
+ var url = (loc?`http://${locip}`:'') + '/json/palettes';
+ fetch(url, {
+ method: 'get'
+ })
+ .then(res => {
+ if (!res.ok) showErrorToast();
+ return res.json();
+ })
+ .then(json => {
+ clearErrorToast();
+ lJson = Object.entries(json);
+ populatePalettes();
+ })
+ .catch(function (error) {
+ showToast(error, true);
+ presetError(false);
+ })
+ .finally(()=>{
+ if (callback) callback();
+ });
+}
+
+function loadFX(callback = null)
+{
+ var url = (loc?`http://${locip}`:'') + '/json/effects';
+
+ fetch(url, {
+ method: 'get'
+ })
+ .then(res => {
+ if (!res.ok) showErrorToast();
+ return res.json();
+ })
+ .then(json => {
+ clearErrorToast();
+ eJson = Object.entries(json);
+ populateEffects();
+ })
+ .catch(function (error) {
+ showToast(error, true);
+ presetError(false);
+ })
+ .finally(()=>{
+ if (callback) callback();
+ });
+}
+
+var pQL = [];
function populateQL()
{
var cn = "";
if (pQL.length > 0) {
- 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
`;
+ pQL.sort((a,b) => (a[0]>b[0]));
+ cn += `Quick load
`;
+ for (var key of (pQL||[])) {
+ cn += ``;
+ }
}
- d.getElementById('pql').innerHTML = cn;
+ gId('pql').innerHTML = cn;
}
function populatePresets(fromls)
{
if (fromls) pJson = JSON.parse(localStorage.getItem("wledP"));
+ if (!pJson) {pJson={};return};
delete pJson["0"];
- var cn = "";
+ var cn = `All presets
`;
var arr = Object.entries(pJson);
arr.sort(cmpP);
- pQL = [];
- var is = [];
- pNum = 0;
-
+ pQL = [];
+ var is = [];
+ pNum = 0;
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);
+ if (qll) pQL.push([i, qll, pName(i)]);
+ is.push(i);
- cn += ``;
- if (cfg.comp.pid) cn += `
${i}
`;
- cn += `
${isPlaylist(i)?"":""}${pName(i)}
+ cn += `
`;
+ if (cfg.comp.pid) cn += `
${i}
`;
+ cn += `
${isPlaylist(i)?"":""}${pName(i)}
-
`;
- pNum++;
+
- ${urows}
- ${inforow("Build",i.vid)}
- ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
- ${inforow("Uptime",getRuntimeStr(i.uptime))}
- ${inforow("Free heap",heap," kB")}
- ${inforow("Estimated current",pwru)}
- ${inforow("Frames / second",i.leds.fps)}
- ${inforow("MAC address",i.mac)}
- ${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")}
- ${inforow("Environment",i.arch + " " + i.core + " (" + i.lwip + ")")}
-
`;
- d.getElementById('kv').innerHTML = cn;
+${urows}
+${inforow("Build",i.vid)}
+${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
+${inforow("Uptime",getRuntimeStr(i.uptime))}
+${inforow("Free heap",heap," kB")}
+${i.psram?inforow("Free PSRAM",(i.psram/1024).toFixed(1)," kB"):""}
+${inforow("Estimated current",pwru)}
+${inforow("Average FPS",i.leds.fps)}
+${inforow("MAC address",i.mac)}
+${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")}
+${inforow("Environment",i.arch + " " + i.core + " (" + i.lwip + ")")}
+`;
+ gId('kv').innerHTML = cn;
}
function populateSegments(s)
@@ -573,94 +661,152 @@ function populateSegments(s)
if (i > lSeg) lSeg = i;
cn += `
-
-
- Segment ${i}
-
-
-
-
-
-
-
-
-
-
-
-
`;
+
+
+ ${inst.n ? inst.n : "Segment "+i}
+
+
+
+
+`;
}
- d.getElementById('segcont').innerHTML = cn;
+ gId('segcont').innerHTML = cn;
if (lowestUnused >= maxSeg) {
- d.getElementById('segutil').innerHTML = '
';
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";
+ updateLen(i);
+ updateTrail(gId(`seg${i}bri`));
+ if (segCount < 2) gId(`segd${lSeg}`).style.display = "none";
}
- d.getElementById('rsbtn').style.display = (segCount > 1) ? "inline":"none";
+ gId('rsbtn').style.display = (segCount > 1) ? "inline":"none";
}
-function populateEffects(effects)
+function btype(b)
{
- var html = `
`;
+ switch (b) {
+ case 2:
+ case 32: return "ESP32";
+ case 1:
+ case 82: return "ESP8266";
+ }
+ return "?";
+}
+
+function bname(o)
+{
+ if (o.name=="WLED") return o.ip;
+ return o.name;
+}
+
+function populateNodes(i,n)
+{
+ var cn="";
+ var urows="";
+ var nnodes = 0;
+ if (n.nodes) {
+ n.nodes.sort((a,b) => (a.name).localeCompare(b.name));
+ for (var x=0;x
-
- * `PIXEL_COUNTS` may need to be adjusted for your set-up. E.g. I have lots of LEDs in Channel 1, but that's probably unusual for most
- * `DATA_PINS` may need to be changed to "16,3,1,26" instead of "16,1,3,26" apparently depending on the board revision or some such
-
-1. Build the mod (e.g. click `Build` from the project task circled above) and update your firmware using the `QL-DigQuad-Pre-v0.1` file, e.g. using _Manual OTA_ from the Config menu. Based on the video and my own experience, you might need to build twice 🤷♂️.
-
-## Observing Temperature
-
-Hopefully you can now see the Temperature listed in the Info page. If not, use Chrome Developer Tools to find the current temperature
-
-1. Open the Developer Tools Console
-2. Enter `lastinfo.u.Temperature` to view the Temperature array
-
- 
-
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/json-temp.png b/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/json-temp.png
deleted file mode 100644
index 66e50112..00000000
Binary files a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/json-temp.png and /dev/null differ
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/params.png b/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/params.png
deleted file mode 100644
index 64233f86..00000000
Binary files a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/params.png and /dev/null differ
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/pio-screenshot.png b/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/pio-screenshot.png
deleted file mode 100644
index e178ed16..00000000
Binary files a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/pio-screenshot.png and /dev/null differ
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/platformio_override.ini b/usermods/quinled_digquad_preassembled_unofficial_v0.1/platformio_override.ini
deleted file mode 100644
index 6f416668..00000000
--- a/usermods/quinled_digquad_preassembled_unofficial_v0.1/platformio_override.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-; QuinLED-Dig-Quad Preassembled Unofficial
-
-[env:QL-DigQuad-Pre-v0.1]
-extends = env:esp32dev
-build_flags = ${common.build_flags_esp32}
- -D ESP32_MULTISTRIP
- -D NUM_STRIPS=4
- -D PIXEL_COUNTS="600, 300, 300, 300"
- -D DATA_PINS="16,1,3,26"
- -D RLYPIN=19
- -D BTNPIN=17
- -D USERMOD_DALLASTEMPERATURE
- -D USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL=10000
-lib_deps = ${env.lib_deps}
- milesburton/DallasTemperature@^3.9.0
- OneWire@~2.3.5
\ No newline at end of file
diff --git a/usermods/ssd1306_i2c_oled_u8g2/README.md b/usermods/ssd1306_i2c_oled_u8g2/README.md
deleted file mode 100644
index 70919cc5..00000000
--- a/usermods/ssd1306_i2c_oled_u8g2/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# SSD1306 128x32 OLED via I2C with u8g2
-This usermod allows to connect 128x32 Oled display to WLED controlled and show
-the next information:
-- Current SSID
-- IP address if obtained
- * in AP mode and turned off lightning AP password is shown
-- Current effect
-- Current palette
-- On/Off icon (sun/moon)
-
-## Hardware
-
-
-## Requirements
-Functionality checked with:
-- commit 095429a7df4f9e2b34dd464f7bbfd068df6558eb
-- Wemos d1 mini
-- PlatformIO
-- Generic SSD1306 128x32 I2C OLED display from aliexpress
-
-### Platformio
-Add `U8g2@~2.27.2` dependency to `lib_deps_external` under `[common]` section in `platformio.ini`:
-```ini
-# platformio.ini
-...
-[common]
-...
-lib_deps_external =
- ...
- U8g2@~2.27.2
-...
-```
-
-### Arduino IDE
-Install library `U8g2 by oliver` in `Tools | Include Library | Manage libraries` menu.
\ No newline at end of file
diff --git a/usermods/ssd1306_i2c_oled_u8g2/assets/hw_connection.png b/usermods/ssd1306_i2c_oled_u8g2/assets/hw_connection.png
deleted file mode 100644
index a0e51b4d..00000000
Binary files a/usermods/ssd1306_i2c_oled_u8g2/assets/hw_connection.png and /dev/null differ
diff --git a/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino b/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino
deleted file mode 100644
index 8c749603..00000000
--- a/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino
+++ /dev/null
@@ -1,175 +0,0 @@
-#include