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

Merge branch 'master' into asyncweb

Browse Source
This commit is contained in:
Scott Baker 2023-03-10 16:06:25 -08:00
commit 59d101e1ed
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/WebOTA.cpp
View File

@ -267,10 +267,24 @@ String WebOTA::get_board_type() {
#else #else
String BOARD_NAME = "Unknown"; String BOARD_NAME = "Unknown";
#endif #endif
return BOARD_NAME; return BOARD_NAME;
} }
String get_mac_address() {
uint8_t mac[6];
// Put the addr in mac
WiFi.macAddress(mac);
// Build a string and return it
char buf[20] = "";
snprintf(buf, sizeof(buf), "%X:%X:%X:%X:%X:%X", mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
String ret = buf;
return ret;
}
int WebOTA::add_http_routes(AsyncWebServer *server, const char *path) { int WebOTA::add_http_routes(AsyncWebServer *server, const char *path) {
// FILE: main.js // FILE: main.js
@ -303,11 +317,12 @@ int WebOTA::add_http_routes(AsyncWebServer *server, const char *path) {
String BOARD_TYPE = this->get_board_type(); String BOARD_TYPE = this->get_board_type();
//size_t x = this->max_sketch_size(); //size_t x = this->max_sketch_size();
String uptime_str = human_time(millis() / 1000); String uptime_str = human_time(millis() / 1000);
const char* mac_addr = WiFi.macAddress().c_str(); String board_type = webota.get_board_type();
String mac_addr = get_mac_address();
char buf[1024]; char buf[1024];
snprintf_P(buf, sizeof(buf), INDEX_HTML, WEBOTA_VERSION, BOARD_TYPE.c_str(), mac_addr, uptime_str.c_str()); snprintf_P(buf, sizeof(buf), INDEX_HTML, WEBOTA_VERSION, board_type, mac_addr.c_str(), uptime_str.c_str());
html = buf; html = buf;
} }