diff --git a/include/WebApi_ws_vedirect_live.h b/include/WebApi_ws_vedirect_live.h index 36f80c8b..f85f332a 100644 --- a/include/WebApi_ws_vedirect_live.h +++ b/include/WebApi_ws_vedirect_live.h @@ -21,6 +21,6 @@ private: uint32_t _lastWsPublish = 0; uint32_t _lastVedirectUpdateCheck = 0; - unsigned long _lastWsCleanup = 0; + uint32_t _lastWsCleanup = 0; uint32_t _newestVedirectTimestamp = 0; }; \ No newline at end of file diff --git a/src/WebApi_vedirect.cpp b/src/WebApi_vedirect.cpp index c7dd3a87..a283f3d9 100644 --- a/src/WebApi_vedirect.cpp +++ b/src/WebApi_vedirect.cpp @@ -11,7 +11,7 @@ void WebApiVedirectClass::init(AsyncWebServer* server) { - using namespace std::placeholders; + using std::placeholders::_1; _server = server; diff --git a/src/WebApi_ws_vedirect_live.cpp b/src/WebApi_ws_vedirect_live.cpp index 1f0b9f7d..3ecf31ee 100644 --- a/src/WebApi_ws_vedirect_live.cpp +++ b/src/WebApi_ws_vedirect_live.cpp @@ -13,7 +13,12 @@ WebApiWsVedirectLiveClass::WebApiWsVedirectLiveClass() void WebApiWsVedirectLiveClass::init(AsyncWebServer* server) { - using namespace std::placeholders; + using std::placeholders::_1; + using std::placeholders::_2; + using std::placeholders::_3; + using std::placeholders::_4; + using std::placeholders::_5; + using std::placeholders::_6; _server = server; _server->on("/api/vedirectlivedata/status", HTTP_GET, std::bind(&WebApiWsVedirectLiveClass::onLivedataStatus, this, _1)); @@ -109,11 +114,11 @@ void WebApiWsVedirectLiveClass::onWebsocketEvent(AsyncWebSocket* server, AsyncWe { if (type == WS_EVT_CONNECT) { char str[64]; - sprintf(str, "Websocket: [%s][%u] connect", server->url(), client->id()); + snprintf(str, sizeof(str), "Websocket: [%s][%u] connect", server->url(), client->id()); Serial.println(str); } else if (type == WS_EVT_DISCONNECT) { char str[64]; - sprintf(str, "Websocket: [%s][%u] disconnect", server->url(), client->id()); + snprintf(str, sizeof(str), "Websocket: [%s][%u] disconnect", server->url(), client->id()); Serial.println(str); } }