From 8b790ef656341aea573beecdd11c7cc969346200 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 23 Sep 2024 14:31:45 -0300 Subject: [PATCH] updated libraries for SDK3 --- platformio.ini | 6 +++--- src/tnc_utils.cpp | 2 +- src/web_utils.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platformio.ini b/platformio.ini index a844858..cb81949 100644 --- a/platformio.ini +++ b/platformio.ini @@ -37,9 +37,9 @@ lib_deps = adafruit/Adafruit BMP280 Library @ 2.6.8 adafruit/Adafruit BME680 Library @ 2.0.4 adafruit/Adafruit Si7021 Library @ 1.5.3 - ayushsharma82/ElegantOTA @ 3.1.1 - ottowinter/ESPAsyncWebServer-esphome @ 3.2.2 - esphome/AsyncTCP-esphome @ 2.1.1 + ayushsharma82/ElegantOTA @ 3.1.5 + mathieucarbou/ESPAsyncWebServer @ 3.2.3 + mathieucarbou/AsyncTCP@3.2.5 [env:ttgo-lora32-v21] board = ttgo-lora32-v21 diff --git a/src/tnc_utils.cpp b/src/tnc_utils.cpp index 23b9d89..e68e26f 100644 --- a/src/tnc_utils.cpp +++ b/src/tnc_utils.cpp @@ -29,7 +29,7 @@ namespace TNC_Utils { } void checkNewClients() { - WiFiClient new_client = tncServer.available(); + WiFiClient new_client = tncServer.accept(); if (new_client.connected()) { for (int i = 0; i < MAX_CLIENTS; i++) { WiFiClient* client = clients[i]; diff --git a/src/web_utils.cpp b/src/web_utils.cpp index 9ac75fe..888d264 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -52,13 +52,13 @@ namespace WEB_Utils { if(Config.webadmin.active && !request->authenticate(Config.webadmin.username.c_str(), Config.webadmin.password.c_str())) return request->requestAuthentication(); - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", (const uint8_t*)web_index_html, web_index_html_len); + AsyncWebServerResponse *response = request->beginResponse(200, "text/html", (const uint8_t*)web_index_html, web_index_html_len); response->addHeader("Content-Encoding", "gzip"); request->send(response); } void handleFavicon(AsyncWebServerRequest *request) { - AsyncWebServerResponse *response = request->beginResponse_P(200, "image/x-icon", (const uint8_t*)favicon_data, favicon_data_len); + AsyncWebServerResponse *response = request->beginResponse(200, "image/x-icon", (const uint8_t*)favicon_data, favicon_data_len); response->addHeader("Content-Encoding", "gzip"); request->send(response); } @@ -232,26 +232,26 @@ namespace WEB_Utils { } void handleStyle(AsyncWebServerRequest *request) { - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/css", (const uint8_t*)web_style_css, web_style_css_len); + AsyncWebServerResponse *response = request->beginResponse(200, "text/css", (const uint8_t*)web_style_css, web_style_css_len); response->addHeader("Content-Encoding", "gzip"); request->send(response); } void handleScript(AsyncWebServerRequest *request) { - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/javascript", (const uint8_t*)web_script_js, web_script_js_len); + AsyncWebServerResponse *response = request->beginResponse(200, "text/javascript", (const uint8_t*)web_script_js, web_script_js_len); response->addHeader("Content-Encoding", "gzip"); request->send(response); } void handleBootstrapStyle(AsyncWebServerRequest *request) { - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/css", (const uint8_t*)web_bootstrap_css, web_bootstrap_css_len); + AsyncWebServerResponse *response = request->beginResponse(200, "text/css", (const uint8_t*)web_bootstrap_css, web_bootstrap_css_len); response->addHeader("Content-Encoding", "gzip"); response->addHeader("Cache-Control", "max-age=3600"); request->send(response); } void handleBootstrapScript(AsyncWebServerRequest *request) { - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/javascript", (const uint8_t*)web_bootstrap_js, web_bootstrap_js_len); + AsyncWebServerResponse *response = request->beginResponse(200, "text/javascript", (const uint8_t*)web_bootstrap_js, web_bootstrap_js_len); response->addHeader("Content-Encoding", "gzip"); response->addHeader("Cache-Control", "max-age=3600"); request->send(response);