Mirrored_Repos/ESP-WebOTA
1
0
Fork 0
mirror of https://github.com/scottchiefbaker/ESP-WebOTA.git synced 2024-08-30 18:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MAC/Uptime to HTML

Browse Source
This commit is contained in:
Scott Baker 2023-03-10 10:17:01 -08:00
parent 22c0406896
commit 940d7bd48d
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/WebOTA.cpp
View File

@ -106,7 +106,8 @@ const char INDEX_HTML[] PROGMEM = R"!^!(
<p> <p>
<b>Board:</b> %s<br /> <b>Board:</b> %s<br />
<b>Flash:</b> %0.1f KB <b>MAC:</b> %s<br />
<b>Uptime:</b> %s<br />
</p> </p>
<div> <div>
@ -220,7 +221,7 @@ int WebOTA::add_http_routes(WebServer *server, const char *path) {
if (this->custom_html != NULL) { if (this->custom_html != NULL) {
html = this->custom_html; html = this->custom_html;
} else { } else {
uint32_t maxSketchSpace = this->max_sketch_size(); //uint32_t maxSketchSpace = this->max_sketch_size();
#if defined(ESP8266) #if defined(ESP8266)
const char* BOARD_NAME = "ESP8266"; const char* BOARD_NAME = "ESP8266";
@ -230,8 +231,11 @@ int WebOTA::add_http_routes(WebServer *server, const char *path) {
const char* BOARD_NAME = "Unknown"; const char* BOARD_NAME = "Unknown";
#endif #endif
String uptime_str = human_time(millis() / 1000);
const char* mac_addr = WiFi.macAddress().c_str();
char buf[1024]; char buf[1024];
snprintf_P(buf, sizeof(buf), INDEX_HTML, WEBOTA_VERSION, BOARD_NAME, maxSketchSpace / float(1024)); snprintf_P(buf, sizeof(buf), INDEX_HTML, WEBOTA_VERSION, BOARD_NAME, mac_addr, uptime_str.c_str());
html = buf; html = buf;
} }
@ -339,6 +343,28 @@ String ip2string(IPAddress ip) {
return ret; return ret;
} }
String WebOTA::human_time(uint32_t sec) {
int days = (sec / 86400);
sec = sec % 86400;
int hours = (sec / 3600);
sec = sec % 3600;
int mins = (sec / 60);
sec = sec % 60;
char buf[20] = "";
if (days) {
snprintf(buf, sizeof(buf), "%d days %d hours\n", days, hours);
} else if (hours) {
snprintf(buf, sizeof(buf), "%d hours %d minutes\n", hours, mins);
} else {
snprintf(buf, sizeof(buf), "%d minutes %d seconds\n", mins, sec);
}
String ret = buf;
return ret;
}
int init_wifi(const char *ssid, const char *password, const char *mdns_hostname) { int init_wifi(const char *ssid, const char *password, const char *mdns_hostname) {
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(ssid, password); WiFi.begin(ssid, password);

1
src/WebOTA.h
View File

@ -33,6 +33,7 @@ class WebOTA {
bool init_has_run; bool init_has_run;
char const * custom_html = NULL; char const * custom_html = NULL;
String get_ota_html(); String get_ota_html();
String human_time(uint32_t sec);
long max_sketch_size(); long max_sketch_size();
}; };