From 8cd5a89d6ab74430d487412c8e881cedad840c5d Mon Sep 17 00:00:00 2001
From: Anthony <adellafave@gmail.com>
Date: Sun, 28 Aug 2022 01:17:57 -0400
Subject: [PATCH] added CPU Temp and RSSI to staus box of webgui.

---
 .../jomjol_tfliteclass/server_tflite.cpp      |  62 +++++++++++++++++-
 firmware/html.zip                             | Bin 179733 -> 179821 bytes
 sd-card/html/wasserzaehler_roi.html           |  34 +++++++++-
 3 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp
index 28619fcf..bf20fb88 100644
--- a/code/components/jomjol_tfliteclass/server_tflite.cpp
+++ b/code/components/jomjol_tfliteclass/server_tflite.cpp
@@ -21,6 +21,7 @@
 #include "server_GPIO.h"
 
 #include "server_file.h"
+#include "connect_wlan.h"
 
 #define DEBUG_DETAIL_ON       
 
@@ -590,6 +591,55 @@ esp_err_t handler_statusflow(httpd_req_t *req)
     return ESP_OK;
 };
 
+esp_err_t handler_cputemp(httpd_req_t *req)
+{
+#ifdef DEBUG_DETAIL_ON       
+    LogFile.WriteHeapInfo("handler_cputemp - Start");       
+#endif
+
+    const char* resp_str;
+    char cputemp[20];
+    
+    sprintf(resp_str, "CPU Temp: %4.1f°C", temperatureRead());
+
+    resp_str = cputemp;
+
+    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
+    httpd_resp_send(req, resp_str, strlen(resp_str));   
+    /* Respond with an empty chunk to signal HTTP response completion */
+    httpd_resp_send_chunk(req, NULL, 0);      
+
+#ifdef DEBUG_DETAIL_ON       
+    LogFile.WriteHeapInfo("handler_cputemp - End");       
+#endif
+
+    return ESP_OK;
+};
+
+esp_err_t handler_rssi(httpd_req_t *req)
+{
+#ifdef DEBUG_DETAIL_ON       
+    LogFile.WriteHeapInfo("handler_rssi - Start");       
+#endif
+
+    const char* resp_str;
+    char rssi[20];
+
+    sprintf(rssi, "RSSI: %idBm", get_WIFI_RSSI());
+
+    resp_str = rssi;
+
+    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
+    httpd_resp_send(req, resp_str, strlen(resp_str));   
+    /* Respond with an empty chunk to signal HTTP response completion */
+    httpd_resp_send_chunk(req, NULL, 0);      
+
+#ifdef DEBUG_DETAIL_ON       
+    LogFile.WriteHeapInfo("handler_rssi - End");       
+#endif
+
+    return ESP_OK;
+};
 
 esp_err_t handler_prevalue(httpd_req_t *req)
 {
@@ -643,7 +693,7 @@ esp_err_t handler_prevalue(httpd_req_t *req)
     httpd_resp_send_chunk(req, NULL, 0);      
 
 #ifdef DEBUG_DETAIL_ON       
-    LogFile.WriteHeapInfo("handler_prevalue - Start");       
+    LogFile.WriteHeapInfo("handler_prevalue - End");       
 #endif
 
     return ESP_OK;
@@ -766,6 +816,16 @@ void register_server_tflite_uri(httpd_handle_t server)
     camuri.user_ctx  = (void*) "Light Off"; 
     httpd_register_uri_handler(server, &camuri);  
     
+    camuri.uri       = "/cputemp.html";
+    camuri.handler   = handler_cputemp;
+    camuri.user_ctx  = (void*) "Light Off"; 
+    httpd_register_uri_handler(server, &camuri);  
+
+    camuri.uri       = "/rssi.html";
+    camuri.handler   = handler_rssi;
+    camuri.user_ctx  = (void*) "Light Off"; 
+    httpd_register_uri_handler(server, &camuri);  
+
     camuri.uri       = "/editflow.html";
     camuri.handler   = handler_editflow;
     camuri.user_ctx  = (void*) "EditFlow"; 
diff --git a/firmware/html.zip b/firmware/html.zip
index 77c973988d41f63ad31d40cd9f849fc9e9632b0c..e09b4cce1eb918fb17ff8fc73410101435030a6a 100644
GIT binary patch
delta 1780
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
W000000001&;JpGb2KTiB0001ReNw3a

delta 1674
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
U000000hc(w0xt%iwE_SD0H|UqlmGw#

diff --git a/sd-card/html/wasserzaehler_roi.html b/sd-card/html/wasserzaehler_roi.html
index 97d88bc3..a69ce90e 100644
--- a/sd-card/html/wasserzaehler_roi.html
+++ b/sd-card/html/wasserzaehler_roi.html
@@ -57,6 +57,8 @@
     <td class="tg-3">
 	<div id="timestamp" ></div>	
 	<div id="statusflow" ></div>	
+	<div id="cputemp" ></div>	
+	<div id="rssi" ></div>	
 	</td>	
   </tr>    
 </table>
@@ -83,6 +85,8 @@ function addZero(i) {
 	$('#img').html('<img src="/img_tmp/alg_roi.jpg" style="max-height:555px; display:block; margin-left:auto;  margin-right:auto;"></img>');
 	$('#timestamp').html("Last Page Refresh:" + (h + ":" + m + ":" + s));
 	loadStatus();
+	loadCPUTemp();
+	loadRSSI();
 	refresh();
 	});
 
@@ -94,10 +98,10 @@ function refresh() {
 	var h = addZero(d.getHours());
 	var m = addZero(d.getMinutes());
 	var s = addZero(d.getSeconds());	
+	
 	// reassign the url to be like alg_roi.jpg?timestamp=456784512 based on timestamp
 	$('#img').html('<img src="/img_tmp/alg_roi.jpg?timestamp='+ timestamp +'"max-height:555px; display:block; margin-left:auto;  margin-right:auto;"></img>');
 	$('#timestamp').html("Last Page Refresh:" + (h + ":" + m + ":" + s));
-	loadStatus();
 	init();
 	  refresh();
 	}, 300000);
@@ -120,6 +124,32 @@ function refresh() {
 		xhttp.send();		
 	}
 
+	function loadCPUTemp() {
+		url = basepath + '/cputemp.html';     
+		var xhttp = new XMLHttpRequest();
+		xhttp.onreadystatechange = function() {
+			if (this.readyState == 4 && this.status == 200) {
+				var _rsp = xhttp.responseText;
+				$('#cputemp').html(_rsp);
+			}
+		}
+		xhttp.open("GET", url, true);
+		xhttp.send();		
+	}
+
+	function loadRSSI() {
+		url = basepath + '/rssi.html';     
+		var xhttp = new XMLHttpRequest();
+		xhttp.onreadystatechange = function() {
+			if (this.readyState == 4 && this.status == 200) {
+				var _rsp = xhttp.responseText;
+				$('#rssi').html(_rsp);
+			}
+		}
+		xhttp.open("GET", url, true);
+		xhttp.send();		
+	}
+		
 	function loadValue(_type, _div, _style) {
 		url = basepath + '/wasserzaehler.html?all=true&type=' + _type;     
 		var xhttp = new XMLHttpRequest();
@@ -167,6 +197,8 @@ function refresh() {
 		loadValue("prevalue", "prevalue");
 		loadValue("error", "error", "font-size:8px");
 		loadStatus();
+		loadCPUTemp();
+		loadRSSI();
 	}
 
 	init();