Skip to content

Commit 8b7f44c

Browse files
ayushsharma82ayushsharma82
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 02d20d2 + ce8b90e commit 8b7f44c

File tree

12 files changed

+956
-834
lines changed

12 files changed

+956
-834
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 79 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,57 @@ on:
44
push:
55
paths-ignore:
66
- "**/**.md"
7-
- "/LICENSE"
8-
- "/keywords.txt"
9-
- "/library.json"
10-
- "/library.properties"
11-
- "/portal"
12-
- "/docs/*"
7+
- "LICENSE"
8+
- "keywords.txt"
9+
- "library.json"
10+
- "library.properties"
11+
- "portal"
12+
- "docs/*"
1313
pull_request:
1414
paths-ignore:
1515
- "**/**.md"
16-
- "/LICENSE"
17-
- "/keywords.txt"
18-
- "/library.json"
19-
- "/library.properties"
20-
- "/portal"
21-
- "/docs/*"
16+
- "LICENSE"
17+
- "keywords.txt"
18+
- "library.json"
19+
- "library.properties"
20+
- "portal"
21+
- "docs/*"
2222

2323
jobs:
2424
arduino:
25-
name: arduino ${{ matrix.name }}
25+
name: Arduino - ${{ matrix.name }}
2626
runs-on: ubuntu-latest
2727
strategy:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: package_esp32_index.json
31+
- name: CI ESP32
3232
core: esp32:esp32
3333
board: esp32:esp32:esp32
3434
index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
35-
- name: package_esp32_dev_index.json
35+
36+
- name: CI ESP32 (Dev Branch)
3637
core: esp32:esp32
3738
board: esp32:esp32:esp32
3839
index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json
40+
3941
# - name: package_esp8266com_index.json
4042
# core: esp8266:esp8266
4143
# board: esp8266:esp8266:huzzah
4244
# index_url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
43-
- name: package_rp2040_index.json
45+
46+
- name: CI Pico W | RP2040+W
4447
core: rp2040:rp2040
4548
board: rp2040:rp2040:rpipicow
46-
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
49+
# index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
50+
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/4.4.3/package_rp2040_index.json
51+
52+
- name: CI Pico 2W | RP2350+W
53+
core: rp2040:rp2040
54+
board: rp2040:rp2040:rpipico2w
55+
# index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
56+
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/4.4.3/package_rp2040_index.json
57+
4758
steps:
4859
- name: Checkout
4960
uses: actions/checkout@v4
@@ -64,18 +75,18 @@ jobs:
6475

6576
- name: Install AsyncTCP (ESP32)
6677
if: ${{ matrix.core == 'esp32:esp32' }}
67-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.3.2
78+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.5
6879

6980
- name: Install ESPAsyncTCP (ESP8266)
7081
if: ${{ matrix.core == 'esp8266:esp8266' }}
71-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
82+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncTCP#v2.0.0
7283

73-
- name: Install AsyncTCP (RP2040)
84+
- name: Install RPAsyncTCP (RP2040)
7485
if: ${{ matrix.core == 'rp2040:rp2040' }}
75-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/khoih-prog/AsyncTCP_RP2040W#v1.2.0
86+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ayushsharma82/RPAsyncTCP#v1.3.0
7687

7788
- name: Install ESPAsyncWebServer
78-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.6.0
89+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncWebServer#v3.7.1
7990

8091
- name: Install ArduinoJson
8192
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.3.0
@@ -96,40 +107,67 @@ jobs:
96107
run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AsyncDemo/AsyncDemo.ino"
97108

98109
platformio:
99-
name: pio ${{ matrix.name }}
110+
name: PlatformIO - ${{ matrix.name }}
100111
runs-on: ubuntu-latest
101112
strategy:
102113
fail-fast: false
103114
matrix:
104115
include:
105-
- name: esp32dev|arduino-3
116+
# - env: ci-esp8266
117+
# board: huzzah
118+
# - env: ci-esp8266
119+
# board: d1_mini
120+
- name: CI ESP32
121+
env: ci-esp32
106122
board: esp32dev
107-
platform: espressif32
108-
opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
109-
- name: esp32-s3-devkitc-1|arduino-3
123+
124+
- name: CI ESP32-S2
125+
env: ci-esp32
126+
board: esp32-s2-saola-1
127+
128+
- name: CI ESP32-S3
129+
env: ci-esp32
110130
board: esp32-s3-devkitc-1
111-
platform: espressif32
112-
opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
113-
# - name: huzzah|espressif8266
114-
# board: huzzah
115-
# platform: espressif8266
116-
# opts: "--project-option 'lib_compat_mode = strict'"
131+
132+
- name: CI ESP32-C3
133+
env: ci-esp32
134+
board: esp32-c3-devkitc-02
135+
136+
- name: CI ESP32-C6
137+
env: ci-esp32
138+
board: esp32-c6-devkitc-1
139+
140+
- name: CI Pico W | RP2040+W
141+
env: ci-rp2040
142+
board: rpipicow
143+
platform: https://github.com/maxgerhardt/platform-raspberrypi.git
144+
opts: "--project-option 'board_build.core=earlephilhower'"
145+
146+
- name: CI Pico 2W | RP2350+W
147+
env: ci-rp2350
148+
board: rpipico2w
149+
platform: https://github.com/maxgerhardt/platform-raspberrypi.git
150+
opts: "--project-option 'board_build.core=earlephilhower'"
117151
steps:
118152
- uses: actions/checkout@v4
153+
119154
- name: Set up cache
120155
uses: actions/cache@v4
121156
with:
157+
key: ${{ runner.os }}-pio
122158
path: |
123159
~/.platformio
124160
~/.cache/pip
125-
key: ${{ matrix.name }}
126-
- uses: actions/setup-python@v5
161+
162+
- name: Setup Python
163+
uses: actions/setup-python@v5
127164
with:
128165
python-version: "3.x"
129-
- name: Install PlatformIO
130-
run: pip install platformio
131-
- name: Install Platform
132-
run: platformio platform install ${{ matrix.platform }}
133166

134-
- run: platformio ci "examples/Demo/Demo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
135-
- run: PLATFORMIO_BUILD_FLAGS="-DNETWIZARD_USE_ASYNC_WEBSERVER=1" platformio ci "examples/AsyncDemo/AsyncDemo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
167+
- name: Setup PlatformIO
168+
run: |
169+
python -m pip install --upgrade pip
170+
pip install --upgrade platformio
171+
172+
- run: PLATFORMIO_SRC_DIR=examples/Demo PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
173+
- run: PLATFORMIO_BUILD_FLAGS="-DNETWIZARD_USE_ASYNC_WEBSERVER=1" PLATFORMIO_SRC_DIR=examples/AsyncDemo PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}

‎examples/AsyncDemo/AsyncDemo.ino‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
Works with following hardware:
1515
- ESP32
1616
- RP2040+W (Example: Raspberry Pi Pico W)
17+
- RP2350+W (Example: Raspberry Pi Pico 2W)
1718
1819
Important note for RP2040 users:
19-
- RP2040 requires LittleFS partition for saving credentials.
20+
- RP2040/RP2350 requires LittleFS partition for saving credentials.
2021
Without LittleFS partition, the app will fail to persist any data.
2122
Make sure to select Tools > Flash Size > "2MB (Sketch 1MB, FS 1MB)" option.
2223
- Doesn't work with bare RP2040, it requires WiFi module/chip (network co-processor)
23-
like in Pico W for NetWizard to work.
24+
like in Pico W / Pico 2W for NetWizard to work.
2425
2526
NOTE: Async mode requires ESPAsyncWebServer dependency and
2627
please make sure to enable async flag in NetWizard.h as per the docs:
@@ -33,8 +34,8 @@
3334

3435
#if defined(ESP32)
3536
#include <AsyncTCP.h>
36-
#elif defined(RP2040)
37-
#include <AsyncTCP_RP2040W.h>
37+
#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
38+
#include <RPAsyncTCP.h>
3839
#endif
3940
#include <ESPAsyncWebServer.h>
4041
#include <NetWizard.h>
@@ -94,7 +95,7 @@ void setup(void) {
9495
status_str = "Unknown";
9596
}
9697

97-
Serial.printf("NW connection status changed: %s\n", status_str);
98+
Serial.printf("NW connection status changed: %s\n", status_str.c_str());
9899
if (status == NetWizardConnectionStatus::CONNECTED) {
99100
// Local IP
100101
Serial.printf("Local IP: %s\n", NW.localIP().toString().c_str());
@@ -132,7 +133,7 @@ void setup(void) {
132133
state_str = "Unknown";
133134
}
134135

135-
Serial.printf("NW portal state changed: %s\n", state_str);
136+
Serial.printf("NW portal state changed: %s\n", state_str.c_str());
136137
});
137138

138139
NW.onConfig([&]() {

‎examples/Demo/Demo.ino‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
Works with following hardware:
1515
- ESP32
1616
- RP2040+W (Example: Raspberry Pi Pico W)
17+
- RP2350+W (Example: Raspberry Pi Pico 2W)
1718
1819
Important note for RP2040 users:
19-
- RP2040 requires LittleFS partition for saving credentials.
20+
- RP2040/RP2350 requires LittleFS partition for saving credentials.
2021
Without LittleFS partition, the app will fail to persist any data.
2122
Make sure to select Tools > Flash Size > "2MB (Sketch 1MB, FS 1MB)" option.
2223
- Doesn't work with bare RP2040, it requires WiFi module/chip (network co-processor)
23-
like in Pico W for NetWizard to work.
24+
like in Pico W / Pico 2W for NetWizard to work.
2425
2526
-------------------------------
2627
@@ -84,7 +85,7 @@ void setup(void) {
8485
status_str = "Unknown";
8586
}
8687

87-
Serial.printf("NW connection status changed: %s\n", status_str);
88+
Serial.printf("NW connection status changed: %s\n", status_str.c_str());
8889
if (status == NetWizardConnectionStatus::CONNECTED) {
8990
// Local IP
9091
Serial.printf("Local IP: %s\n", NW.localIP().toString().c_str());
@@ -122,7 +123,7 @@ void setup(void) {
122123
state_str = "Unknown";
123124
}
124125

125-
Serial.printf("NW portal state changed: %s\n", state_str);
126+
Serial.printf("NW portal state changed: %s\n", state_str.c_str());
126127
});
127128

128129
NW.onConfig([&]() {

‎library.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"platforms": ["espressif8266", "espressif32", "raspberrypi"]
2424
},
2525
{
26-
"owner": "mathieucarbou",
26+
"owner": "ESP32Async",
2727
"name": "ESPAsyncWebServer",
28-
"version": "^3.6.0",
28+
"version": "^3.7.1",
2929
"platforms": ["espressif8266", "espressif32", "raspberrypi"]
3030
},
3131
{
@@ -35,10 +35,7 @@
3535
"platforms": ["espressif8266", "raspberrypi"]
3636
}
3737
],
38-
"version": "1.1.3",
38+
"version": "1.2.0",
3939
"frameworks": "arduino",
40-
"platforms": ["espressif32", "raspberrypi"],
41-
"build": {
42-
"libCompatMode": "strict"
43-
}
40+
"platforms": ["espressif32", "raspberrypi"]
4441
}

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=NetWizard
2-
version=1.1.3
2+
version=1.2.0
33
author=Ayush Sharma
44
category=Communication
55
maintainer=Ayush Sharma <asrocks5@gmail.com>

0 commit comments

Comments
 (0)