From 23e288940203e83140c1465284711a507ae2819f Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Thu, 30 May 2024 01:15:57 +0200 Subject: [PATCH] mathieucarbou/Async TCP @ ^3.1.3 --- .github/workflows/ci.yml | 2 +- README.md | 2 +- docs/index.md | 2 +- examples/Filters/Filters.ino | 38 +++++++++++++++++------------------- library.json | 2 +- platformio.ini | 3 ++- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 925ac0f..07514e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }} - name: Install AsyncTCP-esphome - run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.2 + run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.3 - name: Install ESPAsyncTCP-esphome run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0 diff --git a/README.md b/README.md index 5c9ffb9..ae7a3b0 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ This fork is based on [yubox-node-org/ESPAsyncWebServer](https://github.com/yubo - Added `setAuthentication(const String& username, const String& password)` - Added `StreamConcat` example to shoiw how to stream multiple files in one response - Remove filename after inline in Content-Disposition header according to RFC2183 -- Depends on `mathieucarbou/Async TCP @ ^3.1.2` +- Depends on `mathieucarbou/Async TCP @ ^3.1.3` - Arduino 3 / ESP-IDF 5.1 compatibility ## Documentation diff --git a/docs/index.md b/docs/index.md index 5c9ffb9..ae7a3b0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -26,7 +26,7 @@ This fork is based on [yubox-node-org/ESPAsyncWebServer](https://github.com/yubo - Added `setAuthentication(const String& username, const String& password)` - Added `StreamConcat` example to shoiw how to stream multiple files in one response - Remove filename after inline in Content-Disposition header according to RFC2183 -- Depends on `mathieucarbou/Async TCP @ ^3.1.2` +- Depends on `mathieucarbou/Async TCP @ ^3.1.3` - Arduino 3 / ESP-IDF 5.1 compatibility ## Documentation diff --git a/examples/Filters/Filters.ino b/examples/Filters/Filters.ino index 417b88c..218828a 100644 --- a/examples/Filters/Filters.ino +++ b/examples/Filters/Filters.ino @@ -1,6 +1,4 @@ // Reproduced issue https://github.com/mathieucarbou/ESPAsyncWebServer/issues/26 -// The issue is present when using mathieucarbou/Async TCP @ ^3.1.2 (which is based on ESPHome fork) -// The issue is not present when directly using https://github.com/me-no-dev/AsyncTCP #include #ifdef ESP32 @@ -76,20 +74,20 @@ void setup() { }) .setFilter(ON_STA_FILTER); - assert(WiFi.softAP("esp-captive-portal")); - dnsServer.start(53, "*", WiFi.softAPIP()); - server.begin(); - Serial.println("Captive portal started!"); + // assert(WiFi.softAP("esp-captive-portal")); + // dnsServer.start(53, "*", WiFi.softAPIP()); + // server.begin(); + // Serial.println("Captive portal started!"); - while (!hit1) { - dnsServer.processNextRequest(); - yield(); - } - delay(1000); // Wait for the client to process the response + // while (!hit1) { + // dnsServer.processNextRequest(); + // yield(); + // } + // delay(1000); // Wait for the client to process the response - Serial.println("Captive portal opened, stopping it and connecting to WiFi..."); - dnsServer.stop(); - WiFi.softAPdisconnect(); + // Serial.println("Captive portal opened, stopping it and connecting to WiFi..."); + // dnsServer.stop(); + // WiFi.softAPdisconnect(); WiFi.persistent(false); WiFi.begin("IoT"); @@ -97,13 +95,13 @@ void setup() { delay(500); } Serial.println("Connected to WiFi with IP address: " + WiFi.localIP().toString()); + server.begin(); - while (!hit2) { - delay(10); - } - delay(1000); // Wait for the client to process the response - - ESP.restart(); + // while (!hit2) { + // delay(10); + // } + // delay(1000); // Wait for the client to process the response + // ESP.restart(); } void loop() { diff --git a/library.json b/library.json index b0e231d..b859c33 100644 --- a/library.json +++ b/library.json @@ -27,7 +27,7 @@ { "owner": "mathieucarbou", "name": "Async TCP", - "version": "^3.1.2", + "version": "^3.1.3", "platforms": "espressif32" }, { diff --git a/platformio.ini b/platformio.ini index e1c9b75..642841c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -6,7 +6,8 @@ build_flags = -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE lib_deps = bblanchon/ArduinoJson @ 7.0.4 - mathieucarbou/Async TCP @ ^3.1.2 + mathieucarbou/Async TCP @ ^3.1.3 + ; https://github.com/mathieucarbou/AsyncTCP ; https://github.com/me-no-dev/AsyncTCP esphome/ESPAsyncTCP-esphome @ 2.0.0 upload_protocol = esptool