Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring feature_asyncwebserver up to date with master #1475

Open
wants to merge 112 commits into
base: feature_asyncwebserver
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
c987ee9
abstract httpsend
Feb 23, 2022
e9d0012
abstract httpserver setup
Feb 23, 2022
8ecf057
remove old content length headers
Feb 24, 2022
d8c81ec
macro test
Feb 24, 2022
fd7f400
Revert "Both infoids and _ap_password are intialized by check time. (…
Feb 24, 2022
0aecb22
Fix old sdk esp8266 error w softapssid
Feb 24, 2022
e6d21b8
use macro for webserver routes fstring helper
Feb 24, 2022
713fcfc
disable country in example
tablatronix Mar 10, 2022
8f2c7ae
remove test
tablatronix Mar 10, 2022
acdad80
add callback debuggin
tablatronix Mar 11, 2022
e830fa2
Adding a data attribute for ssid for input value
tablatronix Mar 11, 2022
0d61a6b
esp32 crashes on cb route shared pointer
tablatronix Mar 11, 2022
0994c4b
regression, webserver callbacks before reset crashes
tablatronix Mar 11, 2022
1f3b2e3
typo
tablatronix Mar 14, 2022
d70f358
add check to dissallow starting cp if already running
tablatronix Mar 14, 2022
eb5ba12
#1371
tablatronix Mar 14, 2022
47ce011
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Mar 14, 2022
b436830
remove bad example
tablatronix Mar 14, 2022
e9a02d4
add some button feedback
tablatronix Mar 25, 2022
da02b59
update template styles, add versionng to info
tablatronix Mar 25, 2022
9cec5a2
bump version
tablatronix Mar 25, 2022
9182622
oops
tablatronix Mar 26, 2022
278c57b
fixes #1379
tablatronix Mar 28, 2022
ea4ee02
Output "Unknown" if Arduino/ESP-IDF version is unknown (#1382)
thorrak Mar 29, 2022
88b97c7
#1383 fix
tablatronix Mar 29, 2022
6a85acd
add customMenuHTML
tablatronix Mar 29, 2022
ba63365
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Mar 29, 2022
9cd81e3
debug
tablatronix Mar 29, 2022
918e02d
add resetsetting delay, some complaints its not working shrug
tablatronix Mar 29, 2022
c939374
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Mar 29, 2022
1e62862
fixes #1386
tablatronix Apr 7, 2022
379ffee
clean up variable declarations
tablatronix Apr 7, 2022
590e212
better fix $1386
tablatronix Apr 7, 2022
7bffda3
adds option to keep cfgp open on wifi save
tablatronix Apr 9, 2022
483b834
Fix #1383
tablatronix Apr 12, 2022
cd01cbf
Add .idea to .gitignore for JetBrains IDEs (#1391)
ovidiupruteanu Apr 12, 2022
13b4307
bump beta
tablatronix Apr 14, 2022
b7ca079
add favicon example
tablatronix Apr 20, 2022
833420f
WM_VERSION_STR correction (used in About section) (#1407)
alexmaurer-madis May 3, 2022
8d34744
fixes #1414
tablatronix May 8, 2022
86e413d
Escape single quotes in htmlEntities() (#1413)
abryant May 8, 2022
137410e
Silence debug output (#1404)
mazgch May 8, 2022
e7bb9bc
Change Stream to Print (#1307)
pfn May 8, 2022
c56eec9
change css disabled for all
tablatronix May 15, 2022
9c7fed4
update template
tablatronix May 15, 2022
c6e2b1b
Updated links in README.md (#1431)
JoergAJ Jun 16, 2022
0ab747c
going through todos
tablatronix Jun 17, 2022
ca4b632
remove double non blocking timeout handler
tablatronix Jun 17, 2022
b257590
comments
tablatronix Jun 17, 2022
1af8f45
Update strings_en.h (#1430)
mhendriks Jun 17, 2022
7078bd1
add template js #1430
tablatronix Jun 17, 2022
b567183
Moves presavecallback after static ip copy
tablatronix Jun 17, 2022
317c026
adds setPreSaveParamsCallback
tablatronix Jun 17, 2022
a2c3374
rename wifi callbacks
tablatronix Jun 17, 2022
f9a4778
adds otacallback and progress example callback for Update lib #1435
tablatronix Jun 21, 2022
b05a71b
add comments for httpupdate callbacks
tablatronix Jun 21, 2022
3c2a053
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Jun 21, 2022
260a9ab
add input type example
tablatronix Jun 21, 2022
6522cb3
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Jun 21, 2022
9e408e4
LittleFS Basic example
tablatronix Jun 22, 2022
afd328b
Fix hostname #1403
tablatronix Jun 25, 2022
14aeb75
Fix hostname for esp8266, needs to run after sta ughh
tablatronix Jun 25, 2022
06c6372
#1421
tablatronix Jun 26, 2022
65fec94
fix compiler warnings #1421
tablatronix Jun 27, 2022
01bd8a3
Update WiFiManager.cpp (#1443)
45gfg9 Jun 28, 2022
605d1e8
add missing debug toggle
tablatronix Jun 30, 2022
b8205e7
add connection fixes for esp32 wifi not started yet
tablatronix Jun 30, 2022
f2ed2cb
#1452
tablatronix Jul 14, 2022
7d498ed
Added links in readme file (#1446)
JoergAJ Jul 15, 2022
5ded0c9
Use esp_wifi_set_country_code for ESP32 (#1470)
thorrak Aug 9, 2022
58baeab
adds temporary fallbacks for esp32 set country
tablatronix Aug 9, 2022
8e0a17e
Change test action to install from local directory (#1473)
thorrak Aug 9, 2022
e9dec77
beta ver bump
tablatronix Aug 9, 2022
e0c5fb7
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Aug 9, 2022
b2297e2
Merge branch 'feature_asyncwebserver' into async_conflicts
thorrak Aug 9, 2022
f19efe7
Bring Async up to date
thorrak Aug 9, 2022
19cb05e
Explicitly add dependencies
thorrak Aug 9, 2022
4d38ca7
Incorporate fixes to async branch
thorrak Aug 10, 2022
b90af1a
fixes #1068 esp32 S2
tablatronix Aug 18, 2022
94bb903
#1403 try to increase hostname reliability and keep connect times low
tablatronix Aug 19, 2022
4dcf0cc
Update discord link
tablatronix Aug 24, 2022
5820298
cleanup dev example
tablatronix Aug 31, 2022
9abf5ab
fixes #1206
tablatronix Aug 31, 2022
d04d1f6
enabling #538
tablatronix Aug 31, 2022
201ad2e
Disable temp sensor for all esp32 until can find a better check
tablatronix Sep 1, 2022
bb8aec4
remove reset from basic
tablatronix Sep 1, 2022
62d951c
try to fixup arduino version debugging info
tablatronix Sep 1, 2022
60efff7
fix redefine
tablatronix Sep 1, 2022
7bdcfd5
fix esp8266 versioning
tablatronix Sep 1, 2022
b676daf
oops #1403
tablatronix Sep 12, 2022
2b24b91
fixes #1490
tablatronix Sep 12, 2022
6fb63f8
remove wifiissaved check
tablatronix Sep 12, 2022
1b5d71b
workaround for #1482
tablatronix Sep 12, 2022
c34770e
feat(callback): add config portal timeout callback for handle config …
mrthiti Sep 15, 2022
297a1af
clean up
tablatronix Sep 16, 2022
dda1c45
disable captive portal checks on ota uploades
tablatronix Sep 16, 2022
3545410
remove captive portal check on ota done, remove serial debug
tablatronix Sep 16, 2022
ac2cd86
Merge branch 'master' of https://github.com/tzapu/WiFiManager
tablatronix Sep 16, 2022
d5536fb
remove workardound for arduino 2.0.5 #1482
tablatronix Sep 21, 2022
1545992
ver bump
tablatronix Sep 21, 2022
0ae78ee
add heaadings to template
tablatronix Sep 21, 2022
9eee18a
add esp32 temp sensor back
tablatronix Sep 21, 2022
6d23d75
remove hall sensor, fix temp
tablatronix Sep 21, 2022
30efa2e
add esp model and wifi mode status to info page headers
tablatronix Sep 21, 2022
4ff7d70
add chip model etc to debugging
tablatronix Sep 21, 2022
696b920
update rtc for resetreasons on multiple models
tablatronix Sep 21, 2022
993b1ad
fix: not found getChipModel method for ESP8266 (#1503)
mrthiti Sep 21, 2022
7fa6387
#1504
tablatronix Sep 21, 2022
9707268
Merge pull request #9 from tzapu/master
thorrak Sep 25, 2022
5b41a75
Merge branch 'feature_asyncwebserver' into async_patch
thorrak Sep 25, 2022
e0f29c6
Revert to specifying repo rather than using LDF
thorrak Sep 25, 2022
b46228f
Bring feature_asyncwebserver up to date with master
thorrak Sep 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 53 additions & 53 deletions .github/workflows/compile_examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,58 +11,58 @@ on:
- '.github/workflows/compile_library.yml'

jobs:
esp8266:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
example:
- "examples/Parameters/SPIFFS/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino"
- "examples/Parameters/SPIFFS/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino"
- "examples/NonBlocking/OnDemandNonBlocking/onDemandNonBlocking.ino"
- "examples/NonBlocking/AutoConnectNonBlockingwParams/AutoConnectNonBlockingwParams.ino"
- "examples/NonBlocking/AutoConnectNonBlocking/AutoConnectNonBlocking.ino"
- "examples/Basic/Basic.ino"
- "examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino"
- "examples/Advanced/Advanced.ino"
- "examples/Old_examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino"
- "examples/Old_examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino"
- "examples/Old_examples/AutoConnectWithReset/AutoConnectWithReset.ino"
- "examples/Old_examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino"
- "examples/ParamsChildClass/ParamsChildClass.ino"
- "examples/OnDemand/OnDemandConfigPortal/OnDemandConfigPortal.ino"
- "examples/OnDemand/OnDemandWebPortal/onDemandWebPortal.ino"
# esp8266:
# runs-on: ubuntu-latest
# strategy:
# fail-fast: false
# matrix:
# example:
# - "examples/Parameters/SPIFFS/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino"
# - "examples/Parameters/SPIFFS/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino"
# - "examples/NonBlocking/OnDemandNonBlocking/onDemandNonBlocking.ino"
# - "examples/NonBlocking/AutoConnectNonBlockingwParams/AutoConnectNonBlockingwParams.ino"
# - "examples/NonBlocking/AutoConnectNonBlocking/AutoConnectNonBlocking.ino"
# - "examples/Basic/Basic.ino"
# - "examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino"
# - "examples/Advanced/Advanced.ino"
# - "examples/Old_examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino"
# - "examples/Old_examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino"
# - "examples/Old_examples/AutoConnectWithReset/AutoConnectWithReset.ino"
# - "examples/Old_examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino"
# - "examples/ParamsChildClass/ParamsChildClass.ino"
# - "examples/OnDemand/OnDemandConfigPortal/OnDemandConfigPortal.ino"
# - "examples/OnDemand/OnDemandWebPortal/onDemandWebPortal.ino"

steps:
- uses: actions/checkout@v2
- name: Cache pip
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: ${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v2
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v2
- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
- name: Install 3rd party dependecies
run: |
pio lib -g install \
https://github.com/tzapu/WiFiManager \
https://github.com/bblanchon/ArduinoJson \
https://github.com/knolleary/pubsubclient
# steps:
# - uses: actions/checkout@v2
# - name: Cache pip
# uses: actions/cache@v2
# with:
# path: ~/.cache/pip
# key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
# restore-keys: ${{ runner.os }}-pip-
# - name: Cache PlatformIO
# uses: actions/cache@v2
# with:
# path: ~/.platformio
# key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
# - name: Set up Python
# uses: actions/setup-python@v2
# - name: Install PlatformIO
# run: |
# python -m pip install --upgrade pip
# pip install --upgrade platformio
# - name: Install 3rd party dependecies
# run: |
# pio lib -g install \
# file://. \
# https://github.com/bblanchon/ArduinoJson \
# https://github.com/knolleary/pubsubclient

- name: Run PlatformIO Examples
run: pio ci --board=nodemcuv2
env:
PLATFORMIO_CI_SRC: ${{ matrix.example }}
# - name: Run PlatformIO Examples
# run: pio ci --board=nodemcuv2
# env:
# PLATFORMIO_CI_SRC: ${{ matrix.example }}

esp32:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -105,14 +105,14 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
- name: Install 3rd party dependecies
- name: Install 3rd party dependencies
run: |
pio lib -g install \
https://github.com/tzapu/WiFiManager \
file://. \
https://github.com/bblanchon/ArduinoJson \
https://github.com/knolleary/pubsubclient

- name: Run PlatformIO Examples
run: pio ci --board=esp32dev
env:
PLATFORMIO_CI_SRC: ${{ matrix.example }}
PLATFORMIO_CI_SRC: ${{ matrix.example }}
4 changes: 2 additions & 2 deletions .github/workflows/compile_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
fail-fast: false
matrix:
board:
- "nodemcuv2"
- "lolin32"
# - "nodemcuv2"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -50,4 +50,4 @@ jobs:
echo "void loop() {}" >> main.ino

- name: Run PlatformIO
run: pio ci --board=${{ matrix.board }} .
run: pio ci --board=${{ matrix.board }} --lib="." .
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.cache
.pioenvs
.piolibdeps
.idea
.vscode
!.vscode/extensions.json
/platformio_override.ini
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ Espressif ESPx WiFi Connection manager with fallback web configuration portal

![Release](https://img.shields.io/github/v/release/tzapu/WiFiManager?include_prereleases)

![Build CI Status](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml/badge.svg)
[![Build CI Status](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml/badge.svg)](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml)

![Build CI Status Examples](https://github.com/tzapu/WiFiManager/actions/workflows/compile_examples.yaml/badge.svg)
[![Build CI Status Examples](https://github.com/tzapu/WiFiManager/actions/workflows/compile_examples.yaml/badge.svg)](https://github.com/tzapu/WiFiManager/actions/workflows/compile_examples.yaml)

[![arduino-library-badge](https://www.ardu-badge.com/badge/WiFiManager.svg?)](https://www.ardu-badge.com/WiFiManager)

[![Build with PlatformIO](https://img.shields.io/badge/PlatformIO-Library-orange?)](https://platformio.org/lib/show/567/WiFiManager/installation)

![ESP8266](https://img.shields.io/badge/ESP-8266-000000.svg?longCache=true&style=flat&colorA=CC101F)
[![ESP8266](https://img.shields.io/badge/ESP-8266-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp8266)

![ESP32](https://img.shields.io/badge/ESP-32-000000.svg?longCache=true&style=flat&colorA=CC101F)
![ESP32](https://img.shields.io/badge/ESP-32S2-000000.svg?longCache=true&style=flat&colorA=CC101F)
![ESP32](https://img.shields.io/badge/ESP-32C3-000000.svg?longCache=true&style=flat&colorA=CC101F)
[![ESP32](https://img.shields.io/badge/ESP-32-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32)
[![ESP32](https://img.shields.io/badge/ESP-32S2-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32-s2)
[![ESP32](https://img.shields.io/badge/ESP-32C3-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32-c3)

Member to Member Support / Chat

[![Join the chat at https://gitter.im/tablatronix/WiFiManager](https://badges.gitter.im/tablatronix/WiFiManager.svg)](https://gitter.im/tablatronix/WiFiManager?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![Discord](https://img.shields.io/badge/Discord-WiFiManager-%237289da.svg?logo=discord)](https://discord.gg/dkjJbHwC)
[![Discord](https://img.shields.io/badge/Discord-WiFiManager-%237289da.svg?logo=discord)](https://discord.gg/WgjVprfN)

The configuration portal is of the captive variety, so on various devices it will present the configuration dialogue as soon as you connect to the created access point.

Expand Down Expand Up @@ -171,8 +171,8 @@ Also see [examples](https://github.com/tzapu/WiFiManager/tree/master/examples).

[PlatformIO](https://platformio.org/) is an emerging ecosystem for IoT development, and
is an alternative to using the Arduino IDE. Install `WiFiManager`
using the platformio [library manager](https://docs.platformio.org/en/latest/librarymanager/index.htm) in your editor,
or using the [PlatformIO Core CLI](https://docs.platformio.org/en/latest/userguide/demo.html#library-manager),
using the platformio [library manager](https://docs.platformio.org/en/latest/librarymanager/index.html#librarymanager) in your editor,
or using the [PlatformIO Core CLI](https://docs.platformio.org/en/latest/core/index.html),
or by adding it to your `platformio.ini` as shown below (recommended approach).

The simplest way is to open the `platformio.ini` file at the root of your project, and `WifiManager` to the common top-level env
Expand Down Expand Up @@ -229,7 +229,7 @@ IF YOU NEED TO SAVE PARAMETERS EVEN ON WIFI FAIL OR EMPTY, you must set `setBrea
void setBreakAfterConfig(boolean shouldBreak);
```

See [AutoConnectWithFSParameters Example](https://github.com/tzapu/WiFiManager/tree/master/examples/AutoConnectWithFSParameters).
See [AutoConnectWithFSParameters Example](https://github.com/tzapu/WiFiManager/tree/master/examples/Parameters/SPIFFS/AutoConnectWithFSParameters).
```cpp
wifiManager.setSaveConfigCallback(saveConfigCallback);
```
Expand Down Expand Up @@ -269,7 +269,7 @@ void loop() {
}
}
```
See example for a more complex version. [OnDemandConfigPortal](https://github.com/tzapu/WiFiManager/tree/master/examples/OnDemandConfigPortal)
See example for a more complex version. [OnDemandConfigPortal](https://github.com/tzapu/WiFiManager/tree/master/examples/OnDemand/OnDemandConfigPortal)

#### Exiting from the Configuration Portal
Normally, once entered, the configuration portal will continue to loop until WiFi credentials have been successfully entered or a timeout is reached.
Expand All @@ -291,15 +291,15 @@ Usage scenario would be:

```
- if connection to AP fails, configuration portal starts and you can set /change the values (or use on demand configuration portal)
- once configuration is done and connection is established [save config callback]() is called
- once configuration is done and connection is established save config callback() is called
- once WiFiManager returns control to your application, read and save the new values using the `WiFiManagerParameter` object.
```cpp
mqtt_server = custom_mqtt_server.getValue();
```
This feature is a lot more involved than all the others, so here are some examples to fully show how it is done.
You should also take a look at adding custom HTML to your form.

- Save and load custom parameters to file system in json form [AutoConnectWithFSParameters](https://github.com/tzapu/WiFiManager/tree/master/examples/AutoConnectWithFSParameters)
- Save and load custom parameters to file system in json form [AutoConnectWithFSParameters](https://github.com/tzapu/WiFiManager/tree/master/examples/Parameters/SPIFFS/AutoConnectWithFSParameters)
- *Save and load custom parameters to EEPROM* (not done yet)

#### Custom IP Configuration
Expand Down
Loading