From 8a8e834ace36bb781c25f108bf8afb92b7370929 Mon Sep 17 00:00:00 2001 From: Ewoud Date: Tue, 7 Feb 2023 08:52:58 +0100 Subject: [PATCH] Segment graphics: bug fix to support (mixed) 1D --- wled00/data/index.htm | 5 +- wled00/data/index.js | 27 +- wled00/html_ui.h | 4120 +++++++++++++++++++++-------------------- wled00/wled.h | 2 +- 4 files changed, 2082 insertions(+), 2072 deletions(-) diff --git a/wled00/data/index.htm b/wled00/data/index.htm index f8a41a3f..2f732c54 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -311,8 +311,9 @@
- ☾
-
+ +
+

Transition:  s

diff --git a/wled00/data/index.js b/wled00/data/index.js index 2fe8f9d8..503a1b50 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -679,17 +679,19 @@ ${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 + ")")} -${theap>0?inforow("Total heap",theap," kB"):""} -${theap>0?inforow("used heap",((i.totalheap-i.freeheap)/1000).toFixed(1)," kB"):inforow("Free heap",heap," kB")} -${i.minfreeheap?inforow("Max used heap",((i.totalheap-i.minfreeheap)/1000).toFixed(1)," kB"):""} -${i.tpram?inforow("Total PSRAM",(i.tpram/1024).toFixed(1)," kB"):""} -${i.psram?((i.tpram-i.psram)>16383?inforow("Used PSRAM",((i.tpram-i.psram)/1024).toFixed(1)," kB"):inforow("Used PSRAM",(i.tpram-i.psram)," B")):""} -${i.psusedram?((i.tpram-i.psusedram)>16383?inforow("Max Used PSRAM",((i.tpram-i.psusedram)/1024).toFixed(1)," kB"):inforow("Max Used PSRAM",(i.tpram-i.psusedram)," B")):""} +${theap>0?inforow("Total heap ☾",theap," kB"):""} +${theap>0?inforow("Used heap ☾",((i.totalheap-i.freeheap)/1000).toFixed(1)," kB"):inforow("Free heap",heap," kB")} +${i.minfreeheap?inforow("Max used heap ☾",((i.totalheap-i.minfreeheap)/1000).toFixed(1)," kB"):""} +${inforow("Free heap",heap," kB")} +${i.tpram?inforow("Total PSRAM ☾",(i.tpram/1024).toFixed(1)," kB"):""} +${i.psram?((i.tpram-i.psram)>16383?inforow("Used PSRAM ☾",((i.tpram-i.psram)/1024).toFixed(1)," kB"):inforow("Used PSRAM",(i.tpram-i.psram)," B")):""} +${i.psram?inforow("Free PSRAM",(i.psram/1024).toFixed(1)," kB"):""} +${i.psusedram?((i.tpram-i.psusedram)>16383?inforow("Max Used PSRAM ☾",((i.tpram-i.psusedram)/1024).toFixed(1)," kB"):inforow("Max Used PSRAM",(i.tpram-i.psusedram)," B")):""}
-${i.e32model?inforow(i.e32model,i.e32cores +" core(s)"," "+i.e32speed+" Mhz"):""} -${i.e32flash?inforow("Flash "+i.e32flash+" MB"+", mode "+i.e32flashmode+i.e32flashtext,i.e32flashspeed," Mhz"):""} -${i.e32core0code?inforow("Core0 rst reason",i.e32core0code, " "+i.e32core0text):""} -${i.e32core1code?inforow("Core1 rst reason",i.e32core1code, " "+i.e32core1text):""} +${i.e32model?inforow(i.e32model + " ☾",i.e32cores +" core(s)"," "+i.e32speed+" Mhz"):""} +${i.e32flash?inforow("Flash "+i.e32flash+" MB"+", mode "+i.e32flashmode+i.e32flashtext + " ☾",i.e32flashspeed," Mhz"):""} +${i.e32core0code?inforow("Core0 rst reason ☾",i.e32core0code, " "+i.e32core0text):""} +${i.e32core1code?inforow("Core1 rst reason ☾",i.e32core1code, " "+i.e32core1text):""} `; gId('kv').innerHTML = cn; @@ -1153,6 +1155,7 @@ function draw() { console.log("init", window.innerWidth); //WLEDMM: add canvas, initialize and set UI var canvas = gId("canvas"); + canvas.hidden = false; // c.width = window.innerWidth > 800?300:300; //Mobile gets 400, pc 800 // c.height = c.width; ctx = canvas.getContext('2d'); @@ -1163,6 +1166,7 @@ function draw() { var maxHeight = 0; for (let p=0; p