diff --git a/lib/AsyncTCP/src/AsyncTCP.h b/lib/AsyncTCP/src/AsyncTCP.h index 3d9c61f72..b44a6ced7 100644 --- a/lib/AsyncTCP/src/AsyncTCP.h +++ b/lib/AsyncTCP/src/AsyncTCP.h @@ -48,7 +48,7 @@ extern "C" { //If core is not defined, then we are running in Arduino or PIO #ifndef CONFIG_ASYNC_TCP_RUNNING_CORE #define CONFIG_ASYNC_TCP_RUNNING_CORE -1 //any available core -// Note default was 1 and previously set to 0 for EMS-ESP32 +// Note default was 1 and previously set to 0 for EMS-ESP #define CONFIG_ASYNC_TCP_USE_WDT 1 //if enabled, adds between 33us and 200us per event #endif @@ -56,13 +56,13 @@ extern "C" { #define CONFIG_ASYNC_TCP_TASK_PRIORITY 5 #endif -// EMS-ESP32: stack usage measured: ESP32: ~2.3K, ESP32S3: ~3.5k +// EMS-ESP: stack usage measured: ESP32: ~2.3K, ESP32S3: ~3.5k #ifndef CONFIG_ASYNC_TCP_STACK_SIZE #define CONFIG_ASYNC_TCP_STACK_SIZE 5120 #endif -// EMS-ESP32: maybe enlarge queue to 64 or 128 see https://github.com/emsesp/EMS-ESP32/issues/177 +// EMS-ESP: maybe enlarge queue to 64 or 128 see https://github.com/emsesp/EMS-ESP32/issues/177 #ifndef CONFIG_ASYNC_TCP_QUEUE #define CONFIG_ASYNC_TCP_QUEUE 32 #endif diff --git a/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h b/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h index 8d211aef1..7526b6254 100644 --- a/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h +++ b/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h @@ -28,7 +28,7 @@ #include #include "FS.h" -#include // added by proddy +#include // added by proddy for EMS-ESP #include "StringArray.h" @@ -330,7 +330,7 @@ class AsyncWebServerRequest { AsyncWebServerResponse * beginResponse_P(int code, const String & contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback = nullptr); AsyncWebServerResponse * beginResponse_P(int code, const String & contentType, PGM_P content, AwsTemplateProcessor callback = nullptr); - // added by proddy + // added by proddy for EMS-ESP AsyncWebServerResponse * beginResponse(const String & contentType, const uint8_t * content, size_t len); size_t headers() const; // get header count @@ -532,7 +532,7 @@ typedef std::function ArRequestHandlerFun typedef std::function ArUploadHandlerFunction; typedef std::function ArBodyHandlerFunction; -typedef std::function ArJsonRequestHandlerFunction; // added by proddy +typedef std::function ArJsonRequestHandlerFunction; // added by proddy for EMS-ESP class AsyncWebServer { protected: @@ -566,7 +566,7 @@ class AsyncWebServer { AsyncCallbackWebHandler & on(const char * uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody); - void on(const char * uri, ArJsonRequestHandlerFunction onRequest); // added by proddy + void on(const char * uri, ArJsonRequestHandlerFunction onRequest); // added by proddy for EMS-ESP AsyncStaticWebHandler & serveStatic(const char * uri, fs::FS & fs, const char * path, const char * cache_control = NULL); diff --git a/lib/ESPAsyncWebServer/src/WebServer.cpp b/lib/ESPAsyncWebServer/src/WebServer.cpp index 47545b4e2..5f7309b7e 100644 --- a/lib/ESPAsyncWebServer/src/WebServer.cpp +++ b/lib/ESPAsyncWebServer/src/WebServer.cpp @@ -175,7 +175,7 @@ AsyncCallbackWebHandler & AsyncWebServer::on(const char * uri, ArRequestHandlerF return *handler; } -// added by proddy +// added by proddy for EMS-ESP void AsyncWebServer::on(const char * uri, ArJsonRequestHandlerFunction onRequest) { auto * handler = new AsyncCallbackJsonWebHandler(uri, onRequest); addHandler(handler); diff --git a/lib/uuid-common/src/uuid/common.h b/lib/uuid-common/src/uuid/common.h index ae0baee64..d8c1ef572 100644 --- a/lib/uuid-common/src/uuid/common.h +++ b/lib/uuid-common/src/uuid/common.h @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -// compare_flash_string added by Proddy +// compare_flash_string added by Proddy for EMS-ESP #ifndef UUID_COMMON_H_ #define UUID_COMMON_H_ @@ -102,8 +102,8 @@ void loop(); */ uint64_t get_uptime_ms(); -uint32_t get_uptime(); -uint32_t get_uptime_sec(); +uint32_t get_uptime(); +uint32_t get_uptime_sec(); void set_uptime(); diff --git a/lib/uuid-log/src/uuid/log.h b/lib/uuid-log/src/uuid/log.h index 32496a05b..66e932a23 100644 --- a/lib/uuid-log/src/uuid/log.h +++ b/lib/uuid-log/src/uuid/log.h @@ -64,7 +64,7 @@ namespace uuid { * - Documentation */ -// ANSI Colors - added by Proddy +// ANSI Colors - added by Proddy for EMS-ESP // See https://www.lihaoyi.com/post/BuildyourownCommandLinewithANSIescapecodes.html #define COLOR_RESET "\x1B[0m" #define COLOR_BLACK "\x1B[0;30m" diff --git a/lib_standalone/ESPAsyncWebServer.h b/lib_standalone/ESPAsyncWebServer.h index 504365b59..57e0d7c08 100644 --- a/lib_standalone/ESPAsyncWebServer.h +++ b/lib_standalone/ESPAsyncWebServer.h @@ -92,18 +92,18 @@ class AsyncWebServerRequest { _method = method_s; } - void addInterestingHeader(const String & name){}; + void addInterestingHeader(const String & name) {}; size_t args() const { return 0; } - void send(AsyncWebServerResponse * response){}; - void send(AsyncJsonResponse * response){}; - void send(PrettyAsyncJsonResponse * response){}; - void send(MsgpackAsyncJsonResponse * response){}; - void send(int code, const String & contentType = String(), const String & content = String()){}; - void send(int code, const String & contentType, const __FlashStringHelper *){}; + void send(AsyncWebServerResponse * response) {}; + void send(AsyncJsonResponse * response) {}; + void send(PrettyAsyncJsonResponse * response) {}; + void send(MsgpackAsyncJsonResponse * response) {}; + void send(int code, const String & contentType = String(), const String & content = String()) {}; + void send(int code, const String & contentType, const __FlashStringHelper *) {}; const String & url() const { return _url; @@ -213,7 +213,7 @@ class AsyncWebServerResponse { typedef std::function ArRequestHandlerFunction; typedef std::function ArUploadHandlerFunction; typedef std::function ArBodyHandlerFunction; -typedef std::function ArJsonRequestHandlerFunction; // added by proddy +typedef std::function ArJsonRequestHandlerFunction; // added by proddy for EMS-ESP class AsyncWebServer { protected: @@ -225,15 +225,15 @@ class AsyncWebServer { ~AsyncWebServer(){}; - void begin(){}; + void begin() {}; void end(); AsyncWebHandler & addHandler(AsyncWebHandler * handler) { return *handler; } - void on(const char * uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest){}; - void on(const char * uri, ArJsonRequestHandlerFunction onRequest){}; // added by proddy + void on(const char * uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest) {}; + void on(const char * uri, ArJsonRequestHandlerFunction onRequest) {}; // added by proddy for EMS-ESP }; @@ -246,7 +246,7 @@ class AsyncEventSource : public AsyncWebHandler { return 1; } - void send(const char * message, const char * event = NULL, uint32_t id = 0, uint32_t reconnect = 0){}; + void send(const char * message, const char * event = NULL, uint32_t id = 0, uint32_t reconnect = 0) {}; };