From 1080d3025c92d672d59addf8560e01faed32adb0 Mon Sep 17 00:00:00 2001
From: Jose <joseraj@gmail.com>
Date: Sun, 13 Apr 2025 12:00:19 +0200
Subject: [PATCH] Removed duplicated ram info 	modified:  
 data/www/dashboard.html 	modified:   src/esp_info.cpp 	modified:  
 src/esp_info.h 	modified:   src/web_server.cpp

---
 data/www/dashboard.html | 12 ++----------
 src/esp_info.cpp        |  9 +++++----
 src/esp_info.h          | 13 ++++++-------
 src/web_server.cpp      |  2 +-
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/data/www/dashboard.html b/data/www/dashboard.html
index af9e28a..ff5bcdb 100644
--- a/data/www/dashboard.html
+++ b/data/www/dashboard.html
@@ -31,21 +31,13 @@
                     if (!response.ok) {
                         throw new Error(`HTTP error! status: ${response.status}`);
                     }
-                    return response.json();  // Expect JSON response
+                    return response.text();  // Changed from json() to text()
                 })
                 .then(data => {
                     console.log('Data received:', data);
                     if (!data) throw new Error('Empty response');
                     
-                    let html = '';
-                    Object.entries(data).forEach(([key, value]) => {
-                        html += `
-                        <div class="card">
-                            <h3>${key}</h3>
-                            <p>${value}</p>
-                        </div>`;
-                    });
-                    document.getElementById('dashboard').innerHTML = html;
+                    document.getElementById('dashboard').innerHTML = data;
                 })
                 .catch(error => {
                     console.error('Error:', error);
diff --git a/src/esp_info.cpp b/src/esp_info.cpp
index 268e67c..bf0f5f2 100644
--- a/src/esp_info.cpp
+++ b/src/esp_info.cpp
@@ -116,19 +116,19 @@ String getESPInfoHTML() {
     String html = "<div class='esp-info'><h3>ESP32 Information</h3>";
     html += getTemperatureInfo();
     html += getCPUInfo();
-    html += getRAMInfo();
-    html += getPSRAMInfo();
     html += getFlashInfo();
     html += "</div>";
     return html;
 }
 
-String getRAMInfoHTML() {
-    String html = "<div class='ram-info'><h3>RAM Information</h3>";
+String getMemoryInfoHTML() {
+    String html = "<div class='memory-info'><h3>Memory Information</h3>";
+    html += "<h4>Internal RAM</h4>";
     html += "<p>Heap Size: " + formatBytes(ESP.getHeapSize()) + "</p>";
     html += "<p>Free Heap: " + formatBytes(ESP.getFreeHeap()) + "</p>";
     html += "<p>Min Free Heap: " + formatBytes(ESP.getMinFreeHeap()) + "</p>";
     html += "<p>Max Alloc Heap: " + formatBytes(ESP.getMaxAllocHeap()) + "</p>";
+    
     html += "<h4>PSRAM</h4>";
     html += "<p>PSRAM Size: " + formatBytes(ESP.getPsramSize()) + "</p>";
     html += "<p>Free PSRAM: " + formatBytes(ESP.getFreePsram()) + "</p>";
@@ -137,6 +137,7 @@ String getRAMInfoHTML() {
     html += "</div>";
     return html;
 }
+
 void printESPInfo() {
     Serial.println("ESP32-S3 info");
     Serial.println("Internal RAM");
diff --git a/src/esp_info.h b/src/esp_info.h
index 3d41fc0..fc42123 100644
--- a/src/esp_info.h
+++ b/src/esp_info.h
@@ -10,15 +10,14 @@ void prettyPrintBytes(size_t bytes);
 String formatBytes(size_t bytes);
 
 // Individual info getters
-String getCPUInfo();
-String getTemperatureInfo();
-String getRAMInfo();
-String getPSRAMInfo();
-String getFlashInfo();
+String getCPUInfo();           // CPU related info only
+String getTemperatureInfo();   // Temperature info
+String getMemoryInfo();        // RAM and PSRAM info
+String getFlashInfo();         // Flash memory info
 
 // HTML generators
-String getESPInfoHTML();
-String getRAMInfoHTML();
+String getESPInfoHTML();       // Combines CPU, Temperature, and Flash info
+String getMemoryInfoHTML();    // Memory specific info (replaces getRAMInfoHTML)
 
 // Debug print
 void printESPInfo();
diff --git a/src/web_server.cpp b/src/web_server.cpp
index 8a33246..a459b55 100644
--- a/src/web_server.cpp
+++ b/src/web_server.cpp
@@ -29,7 +29,7 @@ void setupWebServer() {
 
     // ESP Info endpoint
     server.on("/api/espinfo", HTTP_GET, [](AsyncWebServerRequest *request) {
-        String htmlContent = getESPInfoHTML() + getRAMInfoHTML();
+        String htmlContent = getESPInfoHTML() + getMemoryInfoHTML(); // Updated function name
         AsyncWebServerResponse *response = request->beginResponse(200, "text/html", htmlContent);
         request->send(response);
     });