From f7c415a4f8a24e33a10528bfcc8498ed04154cfa Mon Sep 17 00:00:00 2001 From: Francois Date: Mon, 24 Apr 2023 17:25:04 -0400 Subject: [PATCH] Cherry-picked commits from dev branch. Cleaner this way. --- src/HAP.cpp | 5 ----- src/HomeSpan.cpp | 3 +-- src/HomeSpan.h | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/HAP.cpp b/src/HAP.cpp index 4205529..5f26df7 100644 --- a/src/HAP.cpp +++ b/src/HAP.cpp @@ -1242,9 +1242,6 @@ int HAPClient::getStatusURL(){ int hours=(seconds/=60)%24; int days=(seconds/=24); - char mbtlsv[32]; - mbedtls_version_get_string_full(mbtlsv); - sprintf(uptime,"%d:%02d:%02d:%02d",days,hours,mins,secs); String response="HTTP/1.1 200 OK\r\nContent-type: text/html; charset=utf-8\r\n\r\n"; @@ -1265,8 +1262,6 @@ int HAPClient::getStatusURL(){ response+="Arduino-ESP Version:" + String(ARDUINO_ESP_VERSION) + "\n"; response+="ESP-IDF Version:" + String(ESP_IDF_VERSION_MAJOR) + "." + String(ESP_IDF_VERSION_MINOR) + "." + String(ESP_IDF_VERSION_PATCH) + "\n"; response+="HomeSpan Version:" + String(HOMESPAN_VERSION) + "\n"; - response+="Sodium Version:" + String(sodium_version_string()) + " Lib " + String(sodium_library_version_major()) + "." + String(sodium_library_version_minor()) + "\n"; - response+="MbedTLS:" + String(mbtlsv) + "\n"; response+="Sketch Version:" + String(homeSpan.getSketchVersion()) + "\n"; response+="Sodium Version:" + String(sodium_version_string()) + " Lib " + String(sodium_library_version_major()) + "." + String(sodium_library_version_minor()) +"\n"; diff --git a/src/HomeSpan.cpp b/src/HomeSpan.cpp index ffe14cc..d5119eb 100644 --- a/src/HomeSpan.cpp +++ b/src/HomeSpan.cpp @@ -2169,13 +2169,12 @@ SpanUserCommand::SpanUserCommand(char c, const char *s, void (*f)(const char *, // SpanWebLog // /////////////////////////////// -void SpanWebLog::init(uint16_t maxEntries, const char *serv, const char *tz, const char *url, String css){ +void SpanWebLog::init(uint16_t maxEntries, const char *serv, const char *tz, const char *url){ isEnabled=true; this->maxEntries=maxEntries; timeServer=serv; timeZone=tz; statusURL="GET /" + String(url) + " "; - cssStyle=css; log = (log_t *)calloc(maxEntries,sizeof(log_t)); if(timeServer) homeSpan.reserveSocketConnections(1); diff --git a/src/HomeSpan.h b/src/HomeSpan.h index b774136..479678b 100644 --- a/src/HomeSpan.h +++ b/src/HomeSpan.h @@ -160,7 +160,7 @@ struct SpanWebLog{ // optional web status/log data String clientIP; // IP address of client making request (or "0.0.0.0" if not applicable) } *log=NULL; // array of log entries - void init(uint16_t maxEntries, const char *serv, const char *tz, const char *url, String css); + void init(uint16_t maxEntries, const char *serv, const char *tz, const char *url); void initTime(); void vLog(boolean sysMsg, const char *fmr, va_list ap); }; @@ -331,8 +331,8 @@ class Span{ int enableOTA(boolean auth=true, boolean safeLoad=true){return(spanOTA.init(auth, safeLoad, NULL));} // enables Over-the-Air updates, with (auth=true) or without (auth=false) authorization password int enableOTA(const char *pwd, boolean safeLoad=true){return(spanOTA.init(true, safeLoad, pwd));} // enables Over-the-Air updates, with custom authorization password (overrides any password stored with the 'O' command) - void enableWebLog(uint16_t maxEntries=0, const char *serv=NULL, const char *tz="UTC", const char *url=DEFAULT_WEBLOG_URL, String css="\n"){ // enable Web Logging - webLog.init(maxEntries, serv, tz, url, css); + void enableWebLog(uint16_t maxEntries=0, const char *serv=NULL, const char *tz="UTC", const char *url=DEFAULT_WEBLOG_URL){ // enable Web Logging + webLog.init(maxEntries, serv, tz, url); } void addWebLog(boolean sysMsg, const char *fmt, ...){ // add Web Log entry