Skip to content

Commit

Permalink
Arduino 3 / ESP-IDF 5.1 Compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieucarbou committed Apr 19, 2024
1 parent 9756812 commit f090382
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/ci.yml
Expand Up @@ -53,9 +53,10 @@ jobs:
include:
- core: esp32:esp32
board: esp32:esp32:esp32
eeprom: true
softwareserial: false
index_url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
- core: esp32:esp32
board: esp32:esp32:esp32
index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json

steps:
- name: Checkout
Expand All @@ -74,10 +75,10 @@ jobs:
run: arduino-cli lib install ArduinoJson@7.0.2

- name: Install AsyncTCP-esphome
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-AsyncTCP#v2.1.1
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.0.0

- name: Install ESP Async WebServer
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v2.9.0
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v2.9.2

- name: Build BlockingCaptivePortal
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/BlockingCaptivePortal/BlockingCaptivePortal.ino"
Expand Down Expand Up @@ -115,19 +116,19 @@ jobs:
- platform: espressif32
board: esp32dev
flags:
opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/mathieucarbou/arduino-esp32.git#3.0.0-alpha3-fixes, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
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: espressif32
board: wt32-eth01
flags: "-DESPCONNECT_ETH_SUPPORT -DETH_PHY_POWER=16"
opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/mathieucarbou/arduino-esp32.git#3.0.0-alpha3-fixes, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
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: espressif32
board: esp32s3box
flags: "-DESPCONNECT_ETH_SUPPORT -DETH_PHY_ADDR=1 -DETH_PHY_CS=9 -DETH_PHY_IRQ=13 -DETH_PHY_RST=14 -DETH_PHY_SPI_MISO=11 -DETH_PHY_SPI_MOSI=12 -DETH_PHY_SPI_SCK=10 -DETH_PHY_TYPE=ETH_PHY_W5500"
opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/mathieucarbou/arduino-esp32.git#3.0.0-alpha3-fixes, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
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: espressif32
board: esp32-poe
flags:
opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/mathieucarbou/arduino-esp32.git#3.0.0-alpha3-fixes, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
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
Expand Down
4 changes: 2 additions & 2 deletions library.json
Expand Up @@ -29,13 +29,13 @@
{
"owner": "mathieucarbou",
"name": "ESP Async WebServer",
"version": "^2.9.0",
"version": "^2.9.2",
"platforms": "espressif32"
},
{
"owner": "bblanchon",
"name": "ArduinoJson",
"version": "^7.0.3",
"version": "^7.0.4",
"platforms": [
"espressif32"
]
Expand Down
14 changes: 7 additions & 7 deletions platformio.ini
@@ -1,16 +1,16 @@

[env]
; platform = espressif32@6.6.0
platform = espressif32
platform_packages=
platformio/framework-arduinoespressif32 @ https://github.com/mathieucarbou/arduino-esp32.git#3.0.0-alpha3-fixes
platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
platform = espressif32@6.6.0
; 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

framework = arduino

lib_deps =
bblanchon/ArduinoJson @ 7.0.4
mathieucarbou/ESP Async WebServer @ 2.9.0
mathieucarbou/ESP Async WebServer @ 2.9.2

build_flags =
-Wall
Expand All @@ -31,7 +31,7 @@ monitor_filters = esp32_exception_decoder, log2file
; default_envs = esp32dev
; default_envs = esp32-poe
; default_envs = wt32-eth01
default_envs = lilygo_eth_lite_s3
; default_envs = lilygo_eth_lite_s3
lib_dir = .
; src_dir = examples/BlockingCaptivePortal
src_dir = examples/NonBlockingCaptivePortal
Expand Down

0 comments on commit f090382

Please sign in to comment.