From ef083991e3507828018862bda81d445876f5401b Mon Sep 17 00:00:00 2001 From: Yurii Date: Tue, 23 Apr 2024 10:30:42 +0300 Subject: [PATCH] feat: added board info on portal --- src/PortalTask.h | 28 ++++++++++++++++++++++++++++ src_data/index.html | 15 ++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/PortalTask.h b/src/PortalTask.h index 1209022..1f38ba6 100644 --- a/src/PortalTask.h +++ b/src/PortalTask.h @@ -512,6 +512,34 @@ protected: doc["system"]["maxFreeBlockHeap"] = getMaxFreeBlockHeap(); doc["system"]["minMaxFreeBlockHeap"] = getMaxFreeBlockHeap(true); doc["system"]["resetReason"] = getResetReason(); + + #ifdef ARDUINO_ARCH_ESP8266 + doc["system"]["chipModel"] = esp_is_8285() ? "ESP8285" : "ESP8266"; + doc["system"]["chipRevision"] = 0; + doc["system"]["chipCores"] = 1; + doc["system"]["cpuFreq"] = ESP.getCpuFreqMHz(); + doc["system"]["coreVersion"] = ESP.getCoreVersion(); + doc["system"]["flashSize"] = ESP.getFlashChipSize(); + doc["system"]["flashRealSize"] = ESP.getFlashChipRealSize(); + #elif ARDUINO_ARCH_ESP32 + doc["system"]["chipModel"] = ESP.getChipModel(); + doc["system"]["chipRevision"] = ESP.getChipRevision(); + doc["system"]["chipCores"] = ESP.getChipCores(); + doc["system"]["cpuFreq"] = ESP.getCpuFreqMHz(); + doc["system"]["coreVersion"] = ESP.getSdkVersion(); + doc["system"]["flashSize"] = ESP.getFlashChipSize(); + doc["system"]["flashRealSize"] = doc["system"]["flashSize"]; + #else + doc["system"]["chipModel"] = 0; + doc["system"]["chipRevision"] = 0; + doc["system"]["chipCores"] = 0; + doc["system"]["cpuFreq"] = 0; + doc["system"]["coreVersion"] = 0; + doc["system"]["flashSize"] = 0; + doc["system"]["flashRealSize"] = 0; + #endif + + doc.shrinkToFit(); this->bufferedWebServer->send(200, "application/json", doc); diff --git a/src_data/index.html b/src_data/index.html index c7f97db..6a9597c 100644 --- a/src_data/index.html +++ b/src_data/index.html @@ -87,7 +87,7 @@ Version: - + , core/sdk: Build date: @@ -101,6 +101,10 @@ Free memory: of bytes (min: bytes)
max free block: bytes (min: bytes) + + Board: + Chip (rev. )
Cores: , frequency: mHz
Flash size: MB (real: MB) + Last reset reason: @@ -164,6 +168,15 @@ setValue('#max-free-block-heap', result.system.maxFreeBlockHeap); setValue('#min-max-free-block-heap', result.system.minMaxFreeBlockHeap); setValue('#reset-reason', result.system.resetReason); + + setValue('#chip-model', result.system.chipModel); + setValue('#chip-revision', result.system.chipRevision); + setValue('#chip-cores', result.system.chipCores); + setValue('#cpu-freq', result.system.cpuFreq); + setValue('#core-version', result.system.coreVersion); + setValue('#flash-size', result.system.flashSize / 1024 / 1024); + setValue('#flash-real-size', result.system.flashRealSize / 1024 / 1024); + setBusy('#system-busy', '#system-table', false); } catch (error) {