[Sysinfo] Add internal temperature to sysinfo (when supported)

luoyuzhisha · Jun 26, 2024 · aafa860 · aafa860
1 parent 1264f69
commit aafa860
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
@@ -262,7 +262,7 @@ const __FlashStringHelper * getLabel(LabelType::Enum label) {
     case LabelType::OTA_2STEP:              return F("OTA 2-step Needed");
     case LabelType::OTA_POSSIBLE:           return F("OTA possible");
     #if FEATURE_INTERNAL_TEMPERATURE
-    case LabelType::INTERNAL_TEMPERATURE:   return F("Internal temperature (ESP32)");
+    case LabelType::INTERNAL_TEMPERATURE:   return F("Internal Temperature");
     #endif // if FEATURE_INTERNAL_TEMPERATURE
 #if FEATURE_ETHERNET
     case LabelType::ETH_IP_ADDRESS:         return F("Eth IP Address");
@@ -774,9 +774,11 @@ String getFormUnit(LabelType::Enum label)
     case LabelType::FLASH_IDE_SIZE:
       flash_str = F("kB");
       break;
+/*
     case LabelType::UPTIME:
       flash_str = F("min");
       break;
+*/
     case LabelType::LOAD_PCT:
 #if defined(CORE_POST_2_5_0)
   #ifndef LIMIT_BUILD_SIZE
@@ -796,11 +798,11 @@ String getFormUnit(LabelType::Enum label)
     case LabelType::FLASH_IDE_SPEED:
       flash_str = F("MHz");
       break;
-    #if FEATURE_INTERNAL_TEMPERATURE
+#if FEATURE_INTERNAL_TEMPERATURE
     case LabelType::INTERNAL_TEMPERATURE:
       flash_str = F("&deg;C");
       break;
-    #endif // if FEATURE_INTERNAL_TEMPERATURE
+#endif // if FEATURE_INTERNAL_TEMPERATURE
 
 
 

diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
@@ -178,6 +178,7 @@ void handle_json()
         LabelType::UNIT_NAME,
         LabelType::UPTIME,
         LabelType::UPTIME_MS,
+        LabelType::INTERNAL_TEMPERATURE,
         LabelType::BOOT_TYPE,
         LabelType::RESET_REASON,
         LabelType::CPU_ECO_MODE,

diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp
@@ -158,37 +158,41 @@ void handle_root() {
 
     if (wdcounter > 0)
     {
-      addHtmlFloat(getCPUload());
-      addHtml(F("[%] (LC="));
-      addHtmlInt(getLoopCountPerSec());
-      addHtml(')');
+      addHtml(strformat(
+        F("%.2f [%%] (LC=%d)"),
+        getCPUload(),
+        getLoopCountPerSec()));
     }
+
+#if FEATURE_INTERNAL_TEMPERATURE
+    addRowLabelValue(LabelType::INTERNAL_TEMPERATURE);
+#endif
     {
       addRowLabel(LabelType::FREE_MEM);
       addHtmlInt(freeMem);
+      addUnit(getFormUnit(LabelType::FREE_MEM));
 # ifndef BUILD_NO_RAM_TRACKER
       addHtml(strformat(
         F(" (%d - %s)"),
         lowestRAM,
         lowestRAMfunction.c_str()));
 # endif // ifndef BUILD_NO_RAM_TRACKER
-      addUnit(getFormUnit(LabelType::FREE_MEM));
     }
     {
-        # ifdef USE_SECOND_HEAP
+# ifdef USE_SECOND_HEAP
       addRowLabelValue(LabelType::FREE_HEAP_IRAM);
-      # endif // ifdef USE_SECOND_HEAP
+# endif // ifdef USE_SECOND_HEAP
     }
     {
       addRowLabel(LabelType::FREE_STACK);
       addHtmlInt(getCurrentFreeStack());
+      addUnit(getFormUnit(LabelType::FREE_STACK));
 # ifndef BUILD_NO_RAM_TRACKER
       addHtml(strformat(
         F(" (%d - %s)"),
         lowestFreeStack,
         lowestFreeStackfunction.c_str()));
 # endif // ifndef BUILD_NO_RAM_TRACKER
-      addUnit(getFormUnit(LabelType::FREE_STACK));
     }
 
   # if FEATURE_ETHERNET

diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp
@@ -48,6 +48,11 @@
 #  include "../ESPEasyCore/Controller.h" // For finding enabled MQTT controller
 # endif // if FEATURE_MQTT
 
+
+#if FEATURE_INTERNAL_TEMPERATURE
+#include "../Helpers/Hardware_temperature_sensor.h"
+#endif
+
 # ifdef ESP32
 #  include <esp_partition.h>
 # endif // ifdef ESP32
@@ -72,6 +77,9 @@ void handle_sysinfo_json() {
   json_prop(F("time"),   node_time.getDateTimeString('-', ':', ' '));
   json_prop(F("uptime"), getExtendedValue(LabelType::UPTIME));
   json_number(F("cpu_load"),   toString(getCPUload()));
+#if FEATURE_INTERNAL_TEMPERATURE
+  json_number(F("cpu_temp"),   toString(getInternalTemperature()));
+#endif
   json_number(F("loop_count"), String(getLoopCountPerSec()));
   json_close();
 
@@ -322,10 +330,14 @@ void handle_sysinfo_basicInfo() {
   if (wdcounter > 0)
   {
     addHtml(strformat(
-      F("%.2f%% (LC=%d)"),
+      F("%.2f [%%] (LC=%d)"),
       getCPUload(),
       getLoopCountPerSec()));
   }
+#if FEATURE_INTERNAL_TEMPERATURE
+  addRowLabelValue(LabelType::INTERNAL_TEMPERATURE);
+#endif
+
   addRowLabelValue(LabelType::CPU_ECO_MODE);