From afe2be5999b6adfc047fe621d5147b3a3057d953 Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Sat, 20 Apr 2024 16:48:10 +0200 Subject: [PATCH] mathieucarbou/Async TCP @ ^3.0.2 --- .github/workflows/ci.yml | 65 +++++++++++++++++++++++++--------------- README.md | 2 +- docs/index.md | 2 +- library.json | 2 +- platformio.ini | 34 ++++++++++++++------- 5 files changed, 67 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44c6779..afe6d5e 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.0.0 + run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.0.2 - 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 @@ -60,50 +60,67 @@ jobs: run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/SimpleServer/SimpleServer.ino" platformio: - name: PlatformIO + name: pio ${{ matrix.name }} runs-on: ubuntu-latest strategy: fail-fast: false matrix: include: - - platform: espressif32 + - name: esp32dev|espressif32 board: esp32dev + platform: espressif32 opts: - - platform: espressif8266 - board: huzzah - opts: - - platform: espressif32 + - name: esp32dev|espressif32@6.6.0 board: esp32dev + platform: espressif32@6.6.0 + opts: + - name: esp32dev|arduino@3.0.0-rc1 + board: esp32dev + platform: espressif32 opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'" - - platform: espressif8266 + - name: esp32dev|arduino@master + board: esp32dev + platform: espressif32 + opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#master, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'" + - name: esp32-s3-devkitc-1|espressif32 + board: esp32-s3-devkitc-1 + platform: espressif32 + opts: + - name: esp32-s3-devkitc-1|espressif32@6.6.0 + board: esp32-s3-devkitc-1 + platform: espressif32@6.6.0 + opts: + - name: esp32-s3-devkitc-1|arduino@3.0.0-rc1 + board: esp32-s3-devkitc-1 + platform: espressif32 + opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'" + - name: esp32-s3-devkitc-1|arduino@master + board: esp32-s3-devkitc-1 + platform: espressif32 + opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#master, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'" + - name: huzzah|espressif8266 board: huzzah + platform: espressif8266 + opts: + - name: huzzah|arduino@3.0.0-rc1 + board: huzzah + platform: espressif8266 opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'" - steps: - - name: Checkout - uses: actions/checkout@v4 - + - uses: actions/checkout@v4 - name: Set up cache uses: actions/cache@v4 with: path: | ~/.platformio ~/.cache/pip - key: ${{ runner.os }}-platformio - - - name: Set up Python 3.x - uses: actions/setup-python@v5 + key: ${{ matrix.name }} + - uses: actions/setup-python@v5 with: python-version: "3.x" - - - name: Install PlatformIO - run: pip install platformio - - - name: Install platform "${{ matrix.platform }}" - run: platformio platform install ${{ matrix.platform }} - + - run: pip install platformio + - run: platformio platform install ${{ matrix.platform }} - name: Build CaptivePortal run: platformio ci "examples/CaptivePortal/CaptivePortal.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }} - - name: Build SimpleServer run: platformio ci "examples/SimpleServer/SimpleServer.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }} diff --git a/README.md b/README.md index 7e011f0..d430d1c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This fork is based on [yubox-node-org/ESPAsyncWebServer](https://github.com/yubo - [#5](https://github.com/mathieucarbou/ESPAsyncWebServer/pull/5) ([@vortigont](https://github.com/vortigont)): set real "Last-Modified" header based on file's LastWrite time - [#13](https://github.com/mathieucarbou/ESPAsyncWebServer/pull/13) ([@tueddy](https://github.com/tueddy)): Compile with Arduino 3 (ESP-IDF 5.1) - [#14](https://github.com/mathieucarbou/ESPAsyncWebServer/pull/14) ([@nilo85](https://github.com/nilo85)): Add support for Auth & GET requests in AsyncCallbackJsonWebHandler -- Depends on `mathieucarbou/Async TCP @ ^3.0.0` +- Depends on `mathieucarbou/Async TCP @ ^3.0.2` - Arduino 3 / ESP-IDF 5.1 compatibility ## Documentation diff --git a/docs/index.md b/docs/index.md index 7e011f0..d430d1c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -23,7 +23,7 @@ This fork is based on [yubox-node-org/ESPAsyncWebServer](https://github.com/yubo - [#5](https://github.com/mathieucarbou/ESPAsyncWebServer/pull/5) ([@vortigont](https://github.com/vortigont)): set real "Last-Modified" header based on file's LastWrite time - [#13](https://github.com/mathieucarbou/ESPAsyncWebServer/pull/13) ([@tueddy](https://github.com/tueddy)): Compile with Arduino 3 (ESP-IDF 5.1) - [#14](https://github.com/mathieucarbou/ESPAsyncWebServer/pull/14) ([@nilo85](https://github.com/nilo85)): Add support for Auth & GET requests in AsyncCallbackJsonWebHandler -- Depends on `mathieucarbou/Async TCP @ ^3.0.0` +- Depends on `mathieucarbou/Async TCP @ ^3.0.2` - Arduino 3 / ESP-IDF 5.1 compatibility ## Documentation diff --git a/library.json b/library.json index 837fd1e..8653427 100644 --- a/library.json +++ b/library.json @@ -27,7 +27,7 @@ { "owner": "mathieucarbou", "name": "Async TCP", - "version": "^3.0.0", + "version": "^3.0.2", "platforms": "espressif32" }, { diff --git a/platformio.ini b/platformio.ini index bcb8f6b..300a37d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,34 +1,46 @@ [env] framework = arduino - build_flags = -Wall -Wextra -D CONFIG_ARDUHAL_LOG_COLORS -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG - +lib_deps = + bblanchon/ArduinoJson @ 7.0.4 + mathieucarbou/Async TCP @ ^3.0.2 upload_protocol = esptool -upload_port = /dev/cu.usbserial-0001 - -monitor_port = /dev/cu.usbserial-0001 monitor_speed = 115200 monitor_filters = esp32_exception_decoder, log2file [platformio] -default_envs = esp32 lib_dir = . src_dir = examples/CaptivePortal ; src_dir = examples/SimpleServer -[env:esp32] -; platform = espressif32@6.6.0 +[env:v660] +platform = espressif32@6.6.0 +board = esp32dev + +[env:latest-espressif32] +platform = https://github.com/platformio/platform-espressif32.git +board = esp32dev + +[env:latest-arduino] +platform = espressif32 +platform_packages= + platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#master + platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1 +board = esp32dev + +[env:v300-rc1] platform = espressif32 platform_packages= platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1 platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1 board = esp32dev -lib_deps = - bblanchon/ArduinoJson @ 7.0.4 - mathieucarbou/Async TCP @ ^3.0.0 + +[env:Jason2866] +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5 +board = esp32dev [env:esp8266] platform = espressif8266