Merge branch 'small-changes' into mdev

2022-09-20 11:21:09 +02:00
parent 9dd8a59572 5aa7b34b05
commit 96fc330b26
4 changed files with 921 additions and 912 deletions
--- a/wled00/json.cpp
+++ b/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;