added MCU temperature info to system page

pull/60/head
Miroslav Pivovarsky 2024-06-27 22:32:59 +02:00
parent 7cbc3b39be
commit 2689a8f563
8 changed files with 14 additions and 2 deletions

View File

@ -10,7 +10,7 @@
- Library - License - Version - Link - Library - License - Version - Link
- ESPAsyncWebServer - LGPL 3.0 - 2.10.8 - https://github.com/mathieucarbou/ESPAsyncWebServer - ESPAsyncWebServer - LGPL 3.0 - 2.10.8 - https://github.com/mathieucarbou/ESPAsyncWebServer
- AsyncTCP - LGPL 3.0 - 3.1.4 - https://github.com/mathieucarbou/AsyncTCP - AsyncTCP - LGPL 3.0 - 3.1.4 - https://github.com/mathieucarbou/AsyncTCP
- ArduinoJson - MIT - 7.0.4 - https://github.com/bblanchon/ArduinoJson - ArduinoJson - MIT - 7.1.0 - https://github.com/bblanchon/ArduinoJson
- ArduinoUniqueID - MIT - 1.3.0 - https://github.com/ricaun/ArduinoUniqueID - ArduinoUniqueID - MIT - 1.3.0 - https://github.com/ricaun/ArduinoUniqueID
- arduino-esp32 - LGPL 2.1 - 3.0.2 - https://github.com/espressif/arduino-esp32 - arduino-esp32 - LGPL 2.1 - 3.0.2 - https://github.com/espressif/arduino-esp32

View File

@ -316,6 +316,7 @@ const char page_system_html[] PROGMEM = R"rawliteral(
<tr><td class="ps1">Wi-Fi mode</td><td class="ps2" id="wifi_mode"></td></tr> <tr><td class="ps1">Wi-Fi mode</td><td class="ps2" id="wifi_mode"></td></tr>
<tr><td class="ps1">Wi-Fi service AP SSID</td><td class="ps2" id="service_ap_ssid"></td></tr> <tr><td class="ps1">Wi-Fi service AP SSID</td><td class="ps2" id="service_ap_ssid"></td></tr>
<tr><td class="ps1">Uptime</td><td class="ps2" id="uptime"></td></tr> <tr><td class="ps1">Uptime</td><td class="ps2" id="uptime"></td></tr>
<tr><td class="ps1">ESP32 Temperature</td><td class="ps2" id="mcu_temp"></td></tr>
<tr><td style="height: 1px;"></td><td style="height: 1px;"></td></tr> <tr><td style="height: 1px;"></td><td style="height: 1px;"></td></tr>
<tr><td class="ps3">Firmware</td><td></td></tr> <tr><td class="ps3">Firmware</td><td></td></tr>
<tr><td class="ps1">Version</td><td class="ps2" id="sw_ver"></td></tr> <tr><td class="ps1">Version</td><td class="ps2" id="sw_ver"></td></tr>
@ -981,6 +982,7 @@ function get_data(val) {
$("#sd_total").text(obj.sd_total); $("#sd_total").text(obj.sd_total);
$("#sd_free_p").text(obj.sd_free_p); $("#sd_free_p").text(obj.sd_free_p);
$("#sd_used_p").text(obj.sd_used_p); $("#sd_used_p").text(obj.sd_used_p);
$("#mcu_temp").text(obj.mcu_temp);
var sd_free_prog = document.getElementById("progress_bar_sd_free"); var sd_free_prog = document.getElementById("progress_bar_sd_free");
sd_free_prog.style.width = obj.sd_free_p + "%"; sd_free_prog.style.width = obj.sd_free_p + "%";

View File

@ -1170,6 +1170,7 @@ String Server_GetJsonData() {
doc_json["sd_total"] = SystemLog.GetCardSizeMB(); doc_json["sd_total"] = SystemLog.GetCardSizeMB();
doc_json["sd_free_p"] = SystemLog.GetFreeSpacePercent(); doc_json["sd_free_p"] = SystemLog.GetFreeSpacePercent();
doc_json["sd_used_p"] = SystemLog.GetUsedSpacePercent(); doc_json["sd_used_p"] = SystemLog.GetUsedSpacePercent();
doc_json["mcu_temp"] = String(McuTemperature.TemperatureCelsius) + " *C";
doc_json["sw_build"] = SW_BUILD; doc_json["sw_build"] = SW_BUILD;
doc_json["sw_ver"] = SW_VERSION; doc_json["sw_ver"] = SW_VERSION;
doc_json["sw_new_ver"] = FirmwareUpdate.NewVersionFw; doc_json["sw_new_ver"] = FirmwareUpdate.NewVersionFw;

View File

@ -446,12 +446,13 @@ void System_TaskWifiManagement(void *pvParameters) {
while (1) { while (1) {
/* wifi management. Enable/disable AP_STA mode and STA mode*/ /* wifi management. Enable/disable AP_STA mode and STA mode*/
SystemWifiMngt.WifiManagement(); SystemWifiMngt.WifiManagement();
McuTemperature.TemperatureCelsius = temperatureRead();
/* wifi reconnect after signal lost */ /* wifi reconnect after signal lost */
SystemWifiMngt.WiFiReconnect(); SystemWifiMngt.WiFiReconnect();
SystemLog.AddEvent(LogLevel_Info, "Free RAM: " + String(ESP.getFreeHeap()) + " B"); SystemLog.AddEvent(LogLevel_Info, "Free RAM: " + String(ESP.getFreeHeap()) + " B");
SystemLog.AddEvent(LogLevel_Info, "Free SPIRAM: " + String(ESP.getFreePsram()) + " B"); SystemLog.AddEvent(LogLevel_Info, "Free SPIRAM: " + String(ESP.getFreePsram()) + " B");
SystemLog.AddEvent(LogLevel_Info, "Temperature: " + String(temperatureRead()) + " *C"); SystemLog.AddEvent(LogLevel_Info, "Temperature: " + String(McuTemperature.TemperatureCelsius) + " *C");
SystemLog.AddEvent(LogLevel_Verbose, F("WiFiManagement task. Stack free size: "), String(uxTaskGetStackHighWaterMark(NULL)) + "B"); SystemLog.AddEvent(LogLevel_Verbose, F("WiFiManagement task. Stack free size: "), String(uxTaskGetStackHighWaterMark(NULL)) + "B");
SystemLog.AddEvent(LogLevel_Verbose, F("WiFi status: "), String(WiFi.status())); SystemLog.AddEvent(LogLevel_Verbose, F("WiFi status: "), String(WiFi.status()));

View File

@ -13,6 +13,7 @@
WebBasicAuth_struct WebBasicAuth = { false, "", "" }; WebBasicAuth_struct WebBasicAuth = { false, "", "" };
struct FirmwareUpdate_struct FirmwareUpdate = { "Ready", false, 0, 0, 0, false, false, "", "", "", false }; struct FirmwareUpdate_struct FirmwareUpdate = { "Ready", false, 0, 0, 0, false, false, "", "", "", false };
struct McuTemperature_struct McuTemperature = {0.0};
TaskHandle_t Task_CapturePhotoAndSend; TaskHandle_t Task_CapturePhotoAndSend;
TaskHandle_t Task_WiFiManagement; TaskHandle_t Task_WiFiManagement;

View File

@ -36,8 +36,13 @@ struct FirmwareUpdate_struct {
bool OtaUpdateFwAvailable; ///< flag for available new FW version bool OtaUpdateFwAvailable; ///< flag for available new FW version
}; };
struct McuTemperature_struct {
float TemperatureCelsius; ///< MCU temperature
};
extern struct WebBasicAuth_struct WebBasicAuth; ///< structure with configuration for basic auth extern struct WebBasicAuth_struct WebBasicAuth; ///< structure with configuration for basic auth
extern struct FirmwareUpdate_struct FirmwareUpdate; ///< firmware update status and process extern struct FirmwareUpdate_struct FirmwareUpdate; ///< firmware update status and process
extern struct McuTemperature_struct McuTemperature; ///< MCU temperature
extern TaskHandle_t Task_CapturePhotoAndSend; ///< task handle for capture photo and send extern TaskHandle_t Task_CapturePhotoAndSend; ///< task handle for capture photo and send
extern TaskHandle_t Task_WiFiManagement; ///< task handle for wifi management extern TaskHandle_t Task_WiFiManagement; ///< task handle for wifi management

View File

@ -8,6 +8,7 @@
<tr><td class="ps1">Wi-Fi mode</td><td class="ps2" id="wifi_mode"></td></tr> <tr><td class="ps1">Wi-Fi mode</td><td class="ps2" id="wifi_mode"></td></tr>
<tr><td class="ps1">Wi-Fi service AP SSID</td><td class="ps2" id="service_ap_ssid"></td></tr> <tr><td class="ps1">Wi-Fi service AP SSID</td><td class="ps2" id="service_ap_ssid"></td></tr>
<tr><td class="ps1">Uptime</td><td class="ps2" id="uptime"></td></tr> <tr><td class="ps1">Uptime</td><td class="ps2" id="uptime"></td></tr>
<tr><td class="ps1">ESP32 Temperature</td><td class="ps2" id="mcu_temp"></td></tr>
<tr><td style="height: 1px;"></td><td style="height: 1px;"></td></tr> <tr><td style="height: 1px;"></td><td style="height: 1px;"></td></tr>
<tr><td class="ps3">Firmware</td><td></td></tr> <tr><td class="ps3">Firmware</td><td></td></tr>
<tr><td class="ps1">Version</td><td class="ps2" id="sw_ver"></td></tr> <tr><td class="ps1">Version</td><td class="ps2" id="sw_ver"></td></tr>

View File

@ -107,6 +107,7 @@ function get_data(val) {
$("#sd_total").text(obj.sd_total); $("#sd_total").text(obj.sd_total);
$("#sd_free_p").text(obj.sd_free_p); $("#sd_free_p").text(obj.sd_free_p);
$("#sd_used_p").text(obj.sd_used_p); $("#sd_used_p").text(obj.sd_used_p);
$("#mcu_temp").text(obj.mcu_temp);
var sd_free_prog = document.getElementById("progress_bar_sd_free"); var sd_free_prog = document.getElementById("progress_bar_sd_free");
sd_free_prog.style.width = obj.sd_free_p + "%"; sd_free_prog.style.width = obj.sd_free_p + "%";