Merge branch 'small-changes' into mdev

platformio.ini

@@ -512,7 +512,7 @@ build_flags = ${common.build_flags_esp8266}
   ; -D WLED_DISABLE_AUDIO
   ; -D USERMOD_AUDIOREACTIVE
   -UWLED_USE_MY_CONFIG
-; monitor_filters = esp32_exception_decoder
+; monitor_filters = esp8266_exception_decoder
 
 # ------------------------------------------------------------------------------
 # custom board configurations

wled00/data/index.js

@@ -641,6 +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 pwr = i.leds.pwr;
 	var pwru = "Not calculated";
 	if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";}
@@ -659,13 +660,16 @@ function populateInfo(i)
 	if (i.ver.includes("-bl")) vcn = "Supāku";
 	if (i.cn) vcn = i.cn;
 
+	//WLEDSR: add total heap and total PSRAM
 	cn += `v${i.ver} "${vcn}"<br><br><table>
 ${urows}
 ${urows===""?'':'<tr><td colspan=2><hr style="height:1px;border-width:0;color:gray;background-color:gray"></td></tr>'}
 ${inforow("Build",i.vid)}
 ${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
 ${inforow("Uptime",getRuntimeStr(i.uptime))}
+${inforow("Total heap",theap," kB")}
 ${inforow("Free heap",heap," kB")}
+${i.tpram?inforow("Total PSRAM",(i.tpram/1024).toFixed(1)," kB"):""}
 ${i.psram?inforow("Free PSRAM",(i.psram/1024).toFixed(1)," kB"):""}
 ${inforow("Estimated current",pwru)}
 ${inforow("Average FPS",i.leds.fps)}

wled00/json.cpp

@@ -710,8 +710,10 @@ void serializeInfo(JsonObject root)
   root[F("lwip")] = LWIP_VERSION_MAJOR;
   #endif
 
+  root[F("totalheap")] = ESP.getHeapSize(); //WLEDSR
   root[F("freeheap")] = ESP.getFreeHeap();
   #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)
+  if (psramFound()) root[F("tpram")] = ESP.getPsramSize(); //WLEDSR
   if (psramFound()) root[F("psram")] = ESP.getFreePsram();
   #endif
   root[F("uptime")] = millis()/1000 + rolloverMillis*4294967;