Skip to content

Commit

Permalink
overview_add_date_and_time (#3398)
Browse files Browse the repository at this point in the history
* overview_add_date_and_time

* Update overview.html

---------

Co-authored-by: CaCO3 <[email protected]>
  • Loading branch information
SybexX and caco3 authored Dec 1, 2024
1 parent 3f4aaf3 commit 9e84d28
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 1 deletion.
27 changes: 27 additions & 0 deletions code/components/jomjol_flowcontroll/MainFlowControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1487,6 +1487,28 @@ esp_err_t handler_rssi(httpd_req_t *req)
return ESP_OK;
}

esp_err_t handler_current_date(httpd_req_t *req)
{
#ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_uptime - Start");
#endif

std::string formatedDateAndTime = getCurrentTimeString("%Y-%m-%d %H:%M:%S");
// std::string formatedDate = getCurrentTimeString("%Y-%m-%d");

httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_send(req, formatedDateAndTime.c_str(), formatedDateAndTime.length());

/* Respond with an empty chunk to signal HTTP response completion */
httpd_resp_sendstr_chunk(req, NULL);

#ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_uptime - End");
#endif

return ESP_OK;
}

esp_err_t handler_uptime(httpd_req_t *req)
{
#ifdef DEBUG_DETAIL_ON
Expand Down Expand Up @@ -1798,6 +1820,11 @@ void register_server_main_flow_task_uri(httpd_handle_t server)
camuri.user_ctx = (void *)"Light Off";
httpd_register_uri_handler(server, &camuri);

camuri.uri = "/date";
camuri.handler = handler_current_date;
camuri.user_ctx = (void *)"Light Off";
httpd_register_uri_handler(server, &camuri);

camuri.uri = "/uptime";
camuri.handler = handler_uptime;
camuri.user_ctx = (void *)"Light Off";
Expand Down
2 changes: 1 addition & 1 deletion code/main/server_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ httpd_handle_t start_webserver(void)
config.server_port = 80;
config.ctrl_port = 32768;
config.max_open_sockets = 5; //20210921 --> previously 7
config.max_uri_handlers = 40; // Make sure this fits all URI handlers. Memory usage in bytes: 6*max_uri_handlers
config.max_uri_handlers = 41; // Make sure this fits all URI handlers. Memory usage in bytes: 6*max_uri_handlers
config.max_resp_headers = 8;
config.backlog_conn = 5;
config.lru_purge_enable = true; // this cuts old connections if new ones are needed.
Expand Down
16 changes: 16 additions & 0 deletions sd-card/html/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
</tr>
<tr>
<td class="tg-4">
<div id="sntp_date" ></div>
<div id="timestamp" ></div>
<div id="cputemp" ></div>
<div id="rssi" ></div>
Expand Down Expand Up @@ -153,6 +154,7 @@
loadValue("prevalue", "prevalue", "border-collapse: collapse; width: 100%");
loadValue("error", "error", "border-collapse: collapse; width: 100%");
loadStatus();
loadSntpDate();
loadCPUTemp();
loadRSSI();
loadUptime();
Expand Down Expand Up @@ -234,6 +236,20 @@
xhttp.send();
}

function loadSntpDate() {
url = domainname + '/date';
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
var _rsp = xhttp.responseText;
$('#sntp_date').html("Date/Time on device: " + _rsp);
}
}

xhttp.open("GET", url, true);
xhttp.send();
}

function loadUptime() {
url = domainname + '/uptime';
var xhttp = new XMLHttpRequest();
Expand Down

0 comments on commit 9e84d28

Please sign in to comment.