From 253b7c44385bb09dfc604ccae41a95af142e9635 Mon Sep 17 00:00:00 2001 From: Slider0007 <115730895+Slider0007@users.noreply.github.com> Date: Mon, 23 Jan 2023 19:28:27 +0100 Subject: [PATCH 1/3] REST CPU temp: escape special character --- code/components/jomjol_tfliteclass/server_tflite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp index c6a181cda..ad5a172db 100644 --- a/code/components/jomjol_tfliteclass/server_tflite.cpp +++ b/code/components/jomjol_tfliteclass/server_tflite.cpp @@ -692,7 +692,7 @@ esp_err_t handler_cputemp(httpd_req_t *req) const char* resp_str; char cputemp[20]; - sprintf(cputemp, "%4.1f°C", temperatureRead()); + sprintf(cputemp, "%4.1f°C", temperatureRead()); resp_str = cputemp; From c437ed655f001b821d159db4f680cc8d7cadf02b Mon Sep 17 00:00:00 2001 From: Slider0007 Date: Wed, 25 Jan 2023 13:38:03 +0100 Subject: [PATCH 2/3] REST CPUTemp+RSSI: remove units, output as int --- .../jomjol_tfliteclass/server_tflite.cpp | 26 +++++-------------- sd-card/html/overview.html | 22 ++++++++-------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp index ad5a172db..5d4cc0396 100644 --- a/code/components/jomjol_tfliteclass/server_tflite.cpp +++ b/code/components/jomjol_tfliteclass/server_tflite.cpp @@ -689,15 +689,8 @@ esp_err_t handler_cputemp(httpd_req_t *req) LogFile.WriteHeapInfo("handler_cputemp - Start"); #endif - const char* resp_str; - char cputemp[20]; - - sprintf(cputemp, "%4.1f°C", temperatureRead()); - - resp_str = cputemp; - httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); - httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN); + httpd_resp_send(req, std::to_string((int)temperatureRead()).c_str(), HTTPD_RESP_USE_STRLEN); #ifdef DEBUG_DETAIL_ON LogFile.WriteHeapInfo("handler_cputemp - End"); @@ -715,15 +708,8 @@ esp_err_t handler_rssi(httpd_req_t *req) if (getWIFIisConnected()) { - const char* resp_str; - char rssi[20]; - - sprintf(rssi, "%idBm", get_WIFI_RSSI()); - - resp_str = rssi; - httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); - httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN); + httpd_resp_send(req, std::to_string(get_WIFI_RSSI()).c_str(), HTTPD_RESP_USE_STRLEN); } else { @@ -877,12 +863,12 @@ void task_autodoFlow(void *pvParameter) } //CPU Temp -> Logfile - std::stringstream stream; - stream << std::fixed << std::setprecision(1) << temperatureRead(); - LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CPU Temperature: " + stream.str() + "°C"); + LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CPU Temperature: " + std::to_string((int)temperatureRead()) + "°C"); + // WIFI Signal Strength (RSSI) -> Logfile LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "WIFI Signal (RSSI): " + std::to_string(get_WIFI_RSSI()) + "dBm"); - + + //Round finished -> Logfile LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Round #" + std::to_string(countRounds) + " completed (" + std::to_string(getUpTime() - roundStartTime) + " seconds)"); diff --git a/sd-card/html/overview.html b/sd-card/html/overview.html index 1b190e68c..4ef17bae9 100644 --- a/sd-card/html/overview.html +++ b/sd-card/html/overview.html @@ -140,7 +140,7 @@ xhttp.onreadystatechange = function() { if (this.readyState == 4 && this.status == 200) { var _rsp = xhttp.responseText; - $('#cputemp').html("CPU Temperature: " +_rsp); + $('#cputemp').html("CPU Temperature: " +_rsp + "°C"); } } xhttp.open("GET", url, true); @@ -154,21 +154,21 @@ xhttp.onreadystatechange = function() { if (this.readyState == 4 && this.status == 200) { var _rsp = xhttp.responseText; - var _rspVal = _rsp.split("d")[0] - if (_rspVal >= -55) { - $('#rssi').html("WIFI Signal: Excellent (" + _rsp + ")"); + + if (_rsp >= -55) { + $('#rssi').html("WIFI Signal: Excellent (" + _rsp + "dBm)"); } - else if (_rspVal < -55 && _rspVal >= -67) { - $('#rssi').html("WIFI Signal: Good (" + _rsp + ")"); + else if (_rsp < -55 && _rsp >= -67) { + $('#rssi').html("WIFI Signal: Good (" + _rsp + "dBm)"); } - else if (_rspVal < -67 && _rspVal >= -78) { - $('#rssi').html("WIFI Signal: Fair (" + _rsp + ")"); + else if (_rsp < -67 && _rsp >= -78) { + $('#rssi').html("WIFI Signal: Fair (" + _rsp + "dBm)"); } - else if (_rspVal < -78 && _rspVal >= -85) { - $('#rssi').html("WIFI Signal: Weak (" + _rsp + ")"); + else if (_rsp < -78 && _rsp >= -85) { + $('#rssi').html("WIFI Signal: Weak (" + _rsp + "dBm)"); } else { - $('#rssi').html("WIFI Signal: Unreliable (" + _rsp + ")"); + $('#rssi').html("WIFI Signal: Unreliable (" + _rsp + "dBm)"); } } } From b94f189222ffd63f4c5bf81f2fead391a05bbdcd Mon Sep 17 00:00:00 2001 From: Slider0007 Date: Wed, 25 Jan 2023 13:39:40 +0100 Subject: [PATCH 3/3] REST handler sysinfo: CPU tempature as integer --- code/main/server_main.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp index 3e2cd3ae0..e99fd370b 100644 --- a/code/main/server_main.cpp +++ b/code/main/server_main.cpp @@ -333,15 +333,10 @@ esp_err_t img_tmp_virtual_handler(httpd_req_t *req) } - - - - esp_err_t sysinfo_handler(httpd_req_t *req) { - const char* resp_str; std::string zw; - std::string cputemp = std::to_string(temperatureRead()); + std::string cputemp = std::to_string((int)temperatureRead()); std::string gitversion = libfive_git_version(); std::string buildtime = build_time(); std::string gitbranch = libfive_git_branch(); @@ -369,10 +364,8 @@ esp_err_t sysinfo_handler(httpd_req_t *req) "\"freeHeapMem\": \"" + freeheapmem + "\"" + "}]"; - resp_str = zw.c_str(); - httpd_resp_set_type(req, "application/json"); - httpd_resp_sendstr(req, resp_str); + httpd_resp_send(req, zw.c_str(), zw.length()); return ESP_OK; }