Merge branch 'dev' into enable-async-on-rp2040

.github/workflows/ci.yml

@@ -3,85 +3,142 @@ name: Arduino Library CI
 on:
   push:
     paths-ignore:
-      - '**/**.md'
-      - '/keywords.txt'
-      - '/library.json'
-      - '/library.properties'
-      - '/ui'
-      - '/docs'
+      - "**/**.md"
+      - "/keywords.txt"
+      - "/library.json"
+      - "/library.properties"
+      - "/vue-frontend"
+      - "/docs"
   pull_request:
     paths-ignore:
-      - '**/**.md'
-      - '/keywords.txt'
-      - '/library.json'
-      - '/library.properties'
-      - '/ui'
-      - '/docs'
+      - "**/**.md"
+      - "/keywords.txt"
+      - "/library.json"
+      - "/library.properties"
+      - "/vue-frontend"
+      - "/docs"
 
 jobs:
-  Async_CI:
+  arduino:
+    name: arduino ${{ matrix.name }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: package_esp32_index.json
+            core: esp32:esp32
+            board: esp32:esp32:esp32
+            index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          - name: package_esp32_dev_index.json
+            core: esp32:esp32
+            board: esp32:esp32:esp32
+            index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json
+          - name: package_esp8266com_index.json
+            core: esp8266:esp8266
+            board: esp8266:esp8266:huzzah
+            index_url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
+          - name: package_rp2040_index.json
+            core: rp2040:rp2040
+            board: rp2040:rp2040:rpipicow
+            index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
+
     steps:
-      - uses: actions/setup-python@v1
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Arduino Lint
+        uses: arduino/arduino-lint-action@v1
         with:
-          python-version: '3.x'
+          library-manager: update
 
-      - uses: actions/checkout@v2
+      - name: Install arduino-cli
+        run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
 
-      - uses: actions/checkout@v2
-        with:
-           repository: ayushsharma82/ci-arduino
-           path: ci
+      - name: Update core index
+        run: arduino-cli core update-index --additional-urls "${{ matrix.index_url }}"
 
-      - name: pre-install
-        run: bash ci/actions_install.sh
+      - name: Install core
+        run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
 
-      - name: Set configuration
-        run: arduino-cli config set library.enable_unsafe_install true 
+      - name: Install AsyncTCP (ESP32)
+        if: ${{ matrix.core == 'esp32:esp32' }}
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.4
 
-      - name: Install test dependencies
-        run: arduino-cli lib install --git-url https://github.com/me-no-dev/ESPAsyncWebServer --git-url https://github.com/me-no-dev/ESPAsyncTCP --git-url https://github.com/me-no-dev/AsyncTCP
+      - name: Install AsyncTCP (RP2040)
+        if: ${{ matrix.core == 'rp2040:rp2040' }}
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/khoih-prog/AsyncTCP_RP2040W#v1.2.0
 
-      - name: Skip SyncDemo Example
-        run: |
-          cd examples
-          cd Demo
-          touch .esp32.test.skip
-          touch .esp8266.test.skip
-          touch .picow_rp2040.test.skip
+      - name: Install ESPAsyncTCP (ESP8266)
+        if: ${{ matrix.core == 'esp8266:esp8266' }}
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
+
+      - name: Install ESPAsyncWebServer (ESP32/ESP8266)
+        if: ${{ matrix.core == 'esp32:esp32' || matrix.core == 'esp8266:esp8266' || matrix.core == 'rp2040:rp2040' }}
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v2.10.8
+
+      - name: Build Demo
+        run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/Demo/Demo.ino"
 
-      - name: Configure ElegantOTA to Async Mode
+      - name: Configure Async Mode
         run: |
           cd src
           sed -i 's/ELEGANTOTA_USE_ASYNC_WEBSERVER 0/ELEGANTOTA_USE_ASYNC_WEBSERVER 1/' ElegantOTA.h
 
-      - name: Test Async Demo
-        run: python3 ci/build_platform.py esp8266 esp32
+      - name: Build Async Demo
+        run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AsyncDemo/AsyncDemo.ino"
 
-  Sync_CI:
+  platformio:
+    name: pio ${{ matrix.name }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: esp32dev|arduino
+            board: esp32dev
+            platform: espressif32
+            opts:
+          - name: esp32dev|arduino-2
+            board: esp32dev
+            platform: [email protected]
+            opts:
+          - name: esp32dev|arduino-3
+            board: esp32dev
+            platform: espressif32
+            opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.1/esp32-arduino-libs-3.0.1.zip'"
+          - name: esp32-s3-devkitc-1|arduino
+            board: esp32-s3-devkitc-1
+            platform: espressif32
+            opts:
+          - name: esp32-s3-devkitc-1|arduino-2
+            board: esp32-s3-devkitc-1
+            platform: [email protected]
+            opts:
+          - name: esp32-s3-devkitc-1|arduino-3
+            board: esp32-s3-devkitc-1
+            platform: espressif32
+            opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.1/esp32-arduino-libs-3.0.1.zip'"
+          - name: huzzah|espressif8266
+            board: huzzah
+            platform: espressif8266
+            opts:
     steps:
-      - uses: actions/setup-python@v1
+      - uses: actions/checkout@v4
+      - name: Set up cache
+        uses: actions/cache@v4
         with:
-          python-version: '3.x'
-
-      - uses: actions/checkout@v2
-
-      - uses: actions/checkout@v2
+          path: |
+            ~/.platformio
+            ~/.cache/pip
+          key: ${{ matrix.name }}
+      - uses: actions/setup-python@v5
         with:
-           repository: adafruit/ci-arduino
-           path: ci
-
-      - name: pre-install
-        run: bash ci/actions_install.sh
-
-      - name: Skip AsyncDemo Example
-        run: |
-          cd examples
-          cd AsyncDemo
-          touch .esp32.test.skip
-          touch .esp8266.test.skip
-          touch .picow_rp2040.test.skip
-
-      - name: Test Sync Demo
-        run: python3 ci/build_platform.py esp8266 esp32 picow_rp2040
+          python-version: "3.x"
+      - name: Install PlatformIO
+        run: pip install platformio
+      - name: Install Platform
+        run: platformio platform install ${{ matrix.platform }}
+
+      - run: platformio ci "examples/Demo/Demo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
+      - run: PLATFORMIO_BUILD_FLAGS="-DELEGANTOTA_USE_ASYNC_WEBSERVER=1" platformio ci "examples/AsyncDemo/AsyncDemo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}

.github/workflows/stale.yml

@@ -0,0 +1,17 @@
+name: 'Close stale issues and PR'
+on:
+  schedule:
+    - cron: '30 6 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          stale-pr-message: 'This PR is marked as stale because it has been open 45 days with no activity. You can remove stale label or comment if this PR is still valid.'
+          close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
+          days-before-stale: 30
+          days-before-close: 5
+          days-before-pr-close: -1

.gitignore

@@ -36,4 +36,5 @@ node_modules
 .DS_Store
 .vscode
 /build
-/portal
+/portal
+.pio

library.json

@@ -15,21 +15,15 @@
       "maintainer": true
     }
   ],
-  "dependencies":
-  [
-    {
-      "owner": "esphome",
-      "name": "ESPAsyncWebServer-esphome",
-      "version": "^3.0.0",
-      "platforms": ["espressif8266", "espressif32"]
-    },
+  "dependencies": [
     {
-      "name": "ESPAsyncWebServer",
-      "version": "https://github.com/doomhammer/ESPAsyncWebServer#more-rp2040-fixes",
-      "platforms": ["raspberrypi"]
+      "owner": "mathieucarbou",
+      "name": "ESP Async WebServer",
+      "version": "^2.10.4",
+      "platforms": ["espressif8266", "espressif32", "raspberrypi"]
     }
   ],
-  "version": "3.1.1",
+  "version": "3.1.2",
   "frameworks": "arduino",
   "platforms": ["espressif8266", "espressif32", "raspberrypi"]
 }

library.properties

@@ -1,5 +1,5 @@
 name=ElegantOTA
-version=3.1.1
+version=3.1.2
 author=Ayush Sharma
 category=Communication
 maintainer=Ayush Sharma <[email protected]>

platformio.ini

@@ -0,0 +1,46 @@
+[env]
+framework = arduino
+build_flags = 
+  -Wall -Wextra
+  -D CONFIG_ARDUHAL_LOG_COLORS
+  -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+  -D ELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+  mathieucarbou/Async TCP @ ^3.1.4
+  mathieucarbou/ESP Async WebServer @ 2.10.4
+upload_protocol = esptool
+monitor_speed = 115200
+monitor_filters = esp32_exception_decoder, log2file
+
+[platformio]
+lib_dir = .
+; src_dir = examples/Demo
+src_dir = examples/AsyncDemo
+
+[env:arduino]
+platform = espressif32
+board = esp32-s3-devkitc-1
+
+[env:arduino-2]
+platform = [email protected]
+board = esp32-s3-devkitc-1
+
+[env:arduino-3]
+platform = espressif32
+platform_packages=
+  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.1
+  platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.1/esp32-arduino-libs-3.0.1.zip
+board = esp32-s3-devkitc-1
+
+[env:esp8266]
+platform = espressif8266
+board = huzzah
+lib_deps = 
+  mathieucarbou/ESP Async WebServer @ 2.10.4
+  esphome/ESPAsyncTCP-esphome @ 2.0.0
+
+[env:pico]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+board = pico
+framework = arduino
+board_build.core = earlephilhower