From fec4c7f573ddd904114ad550502a169dc2b7c041 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 14 Oct 2022 13:33:25 +0200
Subject: [PATCH] small update to HW info page
* bootcode ->rst reason
*totalHeap not available on 8266
---
wled00/data/index.js | 8 ++++----
wled00/json.cpp | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 4ae61a5c..8347aede 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -641,7 +641,7 @@ function populateInfo(i)
var cn="";
var heap = i.freeheap/1000;
heap = heap.toFixed(1);
- var theap = i.totalheap/1000; theap = theap.toFixed(1); //WLEDSR
+ var theap = (i.totalheap>0)?i.totalheap/1000:-1; theap = theap.toFixed(1); //WLEDSR - total heap is not available on 8266
var pwr = i.leds.pwr;
var pwru = "Not calculated";
if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";}
@@ -667,7 +667,7 @@ ${urows===""?'':'
0?inforow("Total heap",theap," kB"):""}
${inforow("Free heap",heap," kB")}
${i.tpram?inforow("Total PSRAM",(i.tpram/1024).toFixed(1)," kB"):""}
${i.psram?inforow("Used PSRAM",(i.tpram-i.psram)," B"):""}
@@ -680,8 +680,8 @@ ${inforow("Environment",i.arch + " " + i.core + " (" + i.lwip + ")")}
|
|
${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 bootcode", i.e32core0code, " "+i.e32core0text):""}
-${i.e32core1code?inforow("Core1 bootcode",i.e32core1code, " "+i.e32core1text):""}
+${i.e32core0code?inforow("Core0 rst reason",i.e32core0code, " "+i.e32core0text):""}
+${i.e32core1code?inforow("Core1 rst reason",i.e32core1code, " "+i.e32core1text):""}
`;
gId('kv').innerHTML = cn;
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 017eb2ab..960ecc07 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -604,8 +604,9 @@ static String resetCode2Info(int reason) {
case 2 : // 2 = this code is not defined on ESP32
return F("exception"); break;
case 3 : // 3 = Software reset digital core
+ return F("SW reset"); break;
case 12: //12 = Software reset CPU
- return F("SW reboot"); break;
+ return F("SW restart"); break;
case 5 : // 5 = Deep Sleep wakeup reset digital core
return F("wakeup"); break;
case 14: //14 = for APP CPU, reset by PRO CPU