Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 3908fa2

Browse files
committed
Merge branch 'main' into dev_hmueller01_merge_main
2 parents fc884a0 + f79e60c commit 3908fa2

File tree

10 files changed

+168
-73
lines changed

10 files changed

+168
-73
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,26 @@ If applicable, add screenshots to help explain your problem.
3636
Please ensure to specify the following:
3737

3838
* Arduino IDE version (e.g. 1.8.19) or Platform.io version
39-
* `ESP8266` or `ESP32` Core Version (e.g. ESP8266 core v3.0.2 or ESP32 v2.0.5)
39+
* `ESP8266` or `ESP32` Core Version (e.g. ESP8266 core v3.1.0 or ESP32 v2.0.6)
4040
* Contextual information (e.g. what you were trying to achieve)
4141
* Simplest possible steps to reproduce
4242
* Anything that might be relevant in your opinion, such as:
4343
* Operating system (Windows, Ubuntu, etc.) and the output of `uname -a`
4444
* Network configuration
4545

4646

47+
Please be educated, civilized and constructive as you've always been. Disrespective posts against [GitHub Code of Conduct](https://docs.github.com/en/site-policy/github-terms/github-event-code-of-conduct) will be ignored and deleted.
48+
49+
---
50+
4751
### Example
4852

4953
```
5054
Arduino IDE version: 1.8.19
51-
ESP8266 Core Version 3.0.2
55+
ESP32_DEV board
56+
ESP32 core v2.0.6
5257
OS: Ubuntu 20.04 LTS
53-
Linux xy-Inspiron-3593 5.15.0-52-generic #58~20.04.1-Ubuntu SMP Thu Oct 13 13:09:46 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
58+
Linux xy-Inspiron-3593 5.15.0-57-generic #63~20.04.1-Ubuntu SMP Wed Nov 30 13:40:16 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
5459
5560
Context:
5661
I encountered a crash while trying to use the library

CONTRIBUTING.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,33 @@ However, before reporting a bug please check through the following:
1010

1111
If you don't find anything, please [open a new issue](https://github.com/khoih-prog/ESP_WiFiManager_Lite/issues/new).
1212

13+
---
14+
1315
### How to submit a bug report
1416

1517
Please ensure to specify the following:
1618

1719
* Arduino IDE version (e.g. 1.8.19) or Platform.io version
18-
* `ESP8266` or `ESP32` Core Version (e.g. ESP8266 core v3.0.2 or ESP32 v2.0.5)
20+
* `ESP8266` or `ESP32` Core Version (e.g. ESP8266 core v3.1.0 or ESP32 v2.0.6)
1921
* Contextual information (e.g. what you were trying to achieve)
2022
* Simplest possible steps to reproduce
2123
* Anything that might be relevant in your opinion, such as:
2224
* Operating system (Windows, Ubuntu, etc.) and the output of `uname -a`
2325
* Network configuration
2426

2527

28+
Please be educated, civilized and constructive as you've always been. Disrespective posts against [GitHub Code of Conduct](https://docs.github.com/en/site-policy/github-terms/github-event-code-of-conduct) will be ignored and deleted.
29+
30+
---
31+
2632
### Example
2733

2834
```
2935
Arduino IDE version: 1.8.19
30-
ESP8266 Core Version 3.0.2
36+
ESP32_DEV board
37+
ESP32 core v2.0.6
3138
OS: Ubuntu 20.04 LTS
32-
Linux xy-Inspiron-3593 5.15.0-52-generic #58~20.04.1-Ubuntu SMP Thu Oct 13 13:09:46 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
39+
Linux xy-Inspiron-3593 5.15.0-57-generic #63~20.04.1-Ubuntu SMP Wed Nov 30 13:40:16 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
3340
3441
Context:
3542
I encountered a crash while trying to use the library

README.md

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ This [**ESP_WiFiManager_Lite** library](https://github.com/khoih-prog/ESP_WiFiMa
169169
## Prerequisites
170170

171171
1. [`Arduino IDE 1.8.19+` for Arduino](https://github.com/arduino/Arduino). [![GitHub release](https://img.shields.io/github/release/arduino/Arduino.svg)](https://github.com/arduino/Arduino/releases/latest)
172-
2. [`ESP32 Core 2.0.5+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards. [![Latest release](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
173-
3. [`ESP8266 Core 3.0.2+`](https://github.com/esp8266/Arduino) for ESP8266-based boards. [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/). SPIFFS is deprecated from ESP8266 core 2.7.1+, to use LittleFS.
172+
2. [`ESP32 Core 2.0.6+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards. [![Latest release](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
173+
3. [`ESP8266 Core 3.1.0+`](https://github.com/esp8266/Arduino) for ESP8266-based boards. [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/). SPIFFS is deprecated from ESP8266 core 2.7.1+, to use LittleFS.
174174
4. [`ESP_DoubleResetDetector v1.3.2+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector).
175175
5. [`ESP_MultiResetDetector v1.3.2+`](https://github.com/khoih-prog/ESP_MultiResetDetector) if using MRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_MultiResetDetector.svg?)](https://www.ardu-badge.com/ESP_MultiResetDetector).
176176
6. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS with ESP32 core **v1.0.5-**. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [ESP32 core v1.0.6+](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS) and **you don't need to install it if using ESP32 core v1.0.6+**
@@ -235,37 +235,37 @@ Thanks to [Roshan](https://github.com/solroshan) to report the issue in [Error e
235235
236236
Please have a look at [**ESP_WiFiManager Issue 39: Not able to read analog port when using the autoconnect example**](https://github.com/khoih-prog/ESP_WiFiManager/issues/39) to have more detailed description and solution of the issue.
237237
238-
#### 1. ESP32 has 2 ADCs, named ADC1 and ADC2
238+
#### 1. ESP32 has 2 ADCs, named ADC1 and ADC2
239239
240240
#### 2. ESP32 ADCs functions
241241
242-
- ADC1 controls ADC function for pins **GPIO32-GPIO39**
243-
- ADC2 controls ADC function for pins **GPIO0, 2, 4, 12-15, 25-27**
242+
- `ADC1` controls ADC function for pins **GPIO32-GPIO39**
243+
- `ADC2` controls ADC function for pins **GPIO0, 2, 4, 12-15, 25-27**
244244
245-
#### 3. ESP32 WiFi uses ADC2 for WiFi functions
245+
#### 3.. ESP32 WiFi uses ADC2 for WiFi functions
246246
247-
Look in file [**adc_common.c**](https://github.com/espressif/esp-idf/blob/main/components/driver/adc_common.c#L61)
247+
Look in file [**adc_common.c**](https://github.com/espressif/esp-idf/blob/master/components/driver/adc_common.c#L61)
248248
249-
> In ADC2, there're two locks used for different cases:
249+
> In `ADC2`, there're two locks used for different cases:
250250
> 1. lock shared with app and Wi-Fi:
251251
> ESP32:
252-
> When Wi-Fi using the ADC2, we assume it will never stop, so app checks the lock and returns immediately if failed.
252+
> When Wi-Fi using the `ADC2`, we assume it will never stop, so app checks the lock and returns immediately if failed.
253253
> ESP32S2:
254-
> The controller's control over the ADC is determined by the arbiter. There is no need to control by lock.
254+
> The controller's control over the `ADC` is determined by the arbiter. There is no need to control by lock.
255255
>
256256
> 2. lock shared between tasks:
257-
> when several tasks sharing the ADC2, we want to guarantee
257+
> when several tasks sharing the `ADC2`, we want to guarantee
258258
> all the requests will be handled.
259259
> Since conversions are short (about 31us), app returns the lock very soon,
260260
> we use a spinlock to stand there waiting to do conversions one by one.
261261
>
262262
> adc2_spinlock should be acquired first, then adc2_wifi_lock or rtc_spinlock.
263263
264264
265-
- In order to use ADC2 for other functions, we have to **acquire complicated firmware locks and very difficult to do**
266-
- So, it's not advisable to use ADC2 with WiFi/BlueTooth (BT/BLE).
267-
- Use ADC1, and pins GPIO32-GPIO39
268-
- If somehow it's a must to use those pins serviced by ADC2 (**GPIO0, 2, 4, 12, 13, 14, 15, 25, 26 and 27**), use the **fix mentioned at the end** of [**ESP_WiFiManager Issue 39: Not able to read analog port when using the autoconnect example**](https://github.com/khoih-prog/ESP_WiFiManager/issues/39) to work with ESP32 WiFi/BlueTooth (BT/BLE).
265+
- In order to use `ADC2` for other functions, we have to **acquire complicated firmware locks and very difficult to do**
266+
- So, it's not advisable to use `ADC2` with WiFi/BlueTooth (BT/BLE).
267+
- Use `ADC1`, and pins GPIO32-GPIO39
268+
- If somehow it's a must to use those pins serviced by `ADC2` (**GPIO0, 2, 4, 12, 13, 14, 15, 25, 26 and 27**), use the **fix mentioned at the end** of [**ESP_WiFiManager Issue 39: Not able to read analog port when using the autoconnect example**](https://github.com/khoih-prog/ESP_WiFiManager/issues/39) to work with ESP32 WiFi/BlueTooth (BT/BLE).
269269
270270
271271
---
@@ -851,8 +851,8 @@ This is the terminal output when running [**ESP_WiFi**](examples/ESP_WiFi) examp
851851

852852
```
853853
Starting ESP_WiFi using LittleFS on ESP32_DEV
854-
ESP_WiFiManager_Lite v1.9.0
855-
ESP_MultiResetDetector v1.3.1
854+
ESP_WiFiManager_Lite v1.10.0
855+
ESP_MultiResetDetector v1.3.2
856856
LittleFS Flag read = 0xFFFC0003
857857
multiResetDetectorFlag = 0xFFFC0003
858858
lowerBytes = 0x0003, upperBytes = 0x0003
@@ -922,8 +922,8 @@ CCCCCCCCC
922922

923923
```
924924
Starting ESP_WiFi using LittleFS on ESP32_DEV
925-
ESP_WiFiManager_Lite v1.9.0
926-
ESP_MultiResetDetector v1.3.1
925+
ESP_WiFiManager_Lite v1.10.0
926+
ESP_MultiResetDetector v1.3.2
927927
LittleFS Flag read = 0xFFFE0001
928928
multiResetDetectorFlag = 0xFFFE0001
929929
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -994,8 +994,8 @@ This is the terminal output when running [**ESP_WiFi_MQTT**](examples/ESP_WiFi_M
994994

995995
```
996996
Starting ESP_WiFi_MQTT using LittleFS on ESP8266_NODEMCU
997-
ESP_WiFiManager_Lite v1.9.0
998-
ESP_MultiResetDetector v1.3.1
997+
ESP_WiFiManager_Lite v1.10.0
998+
ESP_MultiResetDetector v1.3.2
999999
LittleFS Flag read = 0xFFFE0001
10001000
multiResetDetectorFlag = 0xFFFE0001
10011001
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1069,8 +1069,8 @@ CCC
10691069
10701070
10711071
Starting ESP_WiFi_MQTT using LittleFS on ESP8266_NODEMCU
1072-
ESP_WiFiManager_Lite v1.9.0
1073-
ESP_MultiResetDetector v1.3.1
1072+
ESP_WiFiManager_Lite v1.10.0
1073+
ESP_MultiResetDetector v1.3.2
10741074
LittleFS Flag read = 0xFFFE0001
10751075
multiResetDetectorFlag = 0xFFFE0001
10761076
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1161,8 +1161,8 @@ This is the terminal output when running [**ESP_WiFi_MQTT**](examples/ESP_WiFi_M
11611161

11621162
```
11631163
Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
1164-
ESP_WiFiManager_Lite v1.9.0
1165-
ESP_MultiResetDetector v1.3.1
1164+
ESP_WiFiManager_Lite v1.10.0
1165+
ESP_MultiResetDetector v1.3.2
11661166
LittleFS Flag read = 0xFFFE0001
11671167
multiResetDetectorFlag = 0xFFFE0001
11681168
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1274,8 +1274,8 @@ entry 0x4004c190
12741274
12751275
12761276
Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
1277-
ESP_WiFiManager_Lite v1.9.0
1278-
ESP_MultiResetDetector v1.3.1
1277+
ESP_WiFiManager_Lite v1.10.0
1278+
ESP_MultiResetDetector v1.3.2
12791279
LittleFS Flag read = 0xFFFE0001
12801280
multiResetDetectorFlag = 0xFFFE0001
12811281
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1376,8 +1376,8 @@ This is the terminal output when running [**ESP_WiFi_MQTT**](examples/ESP_WiFi_M
13761376

13771377
```
13781378
Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
1379-
ESP_WiFiManager_Lite v1.9.0
1380-
ESP_MultiResetDetector v1.3.1
1379+
ESP_WiFiManager_Lite v1.10.0
1380+
ESP_MultiResetDetector v1.3.2
13811381
LittleFS Flag read = 0xFFFC0003
13821382
multiResetDetectorFlag = 0xFFFC0003
13831383
lowerBytes = 0x0003, upperBytes = 0x0003
@@ -1404,8 +1404,8 @@ NNNN NNNNN NNNNN NNNNN NN[WML] h:UpdLittleFS
14041404

14051405
```
14061406
Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
1407-
ESP_WiFiManager_Lite v1.9.0
1408-
ESP_MultiResetDetector v1.3.1
1407+
ESP_WiFiManager_Lite v1.10.0
1408+
ESP_MultiResetDetector v1.3.2
14091409
LittleFS Flag read = 0xFFFE0001
14101410
multiResetDetectorFlag = 0xFFFE0001
14111411
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1460,8 +1460,8 @@ This is the terminal output when running [**ESP_WiFi**](examples/ESP_WiFi) examp
14601460

14611461
```
14621462
Starting ESP_WiFi_MQTT using LittleFS on ESP32_DEV
1463-
ESP_WiFiManager_Lite v1.9.0
1464-
ESP_MultiResetDetector v1.3.1
1463+
ESP_WiFiManager_Lite v1.10.0
1464+
ESP_MultiResetDetector v1.3.2
14651465
LittleFS Flag read = 0xFFFC0003
14661466
multiResetDetectorFlag = 0xFFFC0003
14671467
lowerBytes = 0x0003, upperBytes = 0x0003
@@ -1504,8 +1504,8 @@ CCC
15041504

15051505
```
15061506
Starting ESP_WiFi_MQTT using LittleFS on ESP32_DEV
1507-
ESP_WiFiManager_Lite v1.9.0
1508-
ESP_MultiResetDetector v1.3.1
1507+
ESP_WiFiManager_Lite v1.10.0
1508+
ESP_MultiResetDetector v1.3.2
15091509
LittleFS Flag read = 0xFFFE0001
15101510
multiResetDetectorFlag = 0xFFFE0001
15111511
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1552,8 +1552,8 @@ This is the terminal output when running [**ESP_WiFi**](examples/ESP_WiFi) examp
15521552

15531553
```
15541554
Starting ESP_WiFi using LittleFS on ESP32S3_DEV
1555-
ESP_WiFiManager_Lite v1.9.0
1556-
ESP_MultiResetDetector v1.3.1
1555+
ESP_WiFiManager_Lite v1.10.0
1556+
ESP_MultiResetDetector v1.3.2
15571557
LittleFS Flag read = 0xFFFE0001
15581558
multiResetDetectorFlag = 0xFFFE0001
15591559
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1594,8 +1594,8 @@ This is the terminal output when running [**ESP_WiFi**](examples/ESP_WiFi) examp
15941594

15951595
```
15961596
Starting ESP_WiFi using LittleFS on ESP32C3_DEV
1597-
ESP_WiFiManager_Lite v1.9.0
1598-
ESP_MultiResetDetector v1.3.1
1597+
ESP_WiFiManager_Lite v1.10.0
1598+
ESP_MultiResetDetector v1.3.2
15991599
LittleFS Flag read = 0xFFFE0001
16001600
multiResetDetectorFlag = 0xFFFE0001
16011601
lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1709,6 +1709,8 @@ Submit issues to: [ESP_WiFiManager_Lite issues](https://github.com/khoih-prog/ES
17091709
33. Add function `isConfigMode()` to signal system is in Config Portal mode
17101710
34. Fix ESP32 chipID
17111711
35. Add ESP32 getChipID() and getChipOUI() functions
1712+
36. Add `Captive-Portal` feature. Check [Captive portal #24](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/24)
1713+
37. Add option to not `USE_LED_BUILTIN` for Config-Portal. Check [added switch to turn use of builtin LED off #20](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/20)
17121714

17131715

17141716
---
@@ -1719,11 +1721,17 @@ Submit issues to: [ESP_WiFiManager_Lite issues](https://github.com/khoih-prog/ES
17191721
Please help contribute to this project and add your name here.
17201722

17211723
1. Thanks to [Michael H. "bizprof"](https://github.com/bizprof). With the impressive new feature :
1722-
- `Enable scan of WiFi networks for selection in Configuration Portal`. Check [PR for v1.3.0 - Enable scan of WiFi networks #10](https://github.com/khoih-prog/WiFiManager_NINA_Lite/pull/10) leading to v1.5.0
1724+
- `Enable scan of WiFi networks for selection in Configuration Portal`. Check [PR for v1.3.0 - Enable scan of WiFi networks #10](https://github.com/khoih-prog/WiFiManager_NINA_Lite/pull/10) leading to `v1.5.0 `
1725+
2. Thanks to [Holger Müller](https://github.com/hmueller01)for these PRs leading to `v1.10.0` :
1726+
- [Captive portal #24](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/24)
1727+
- [reset cleanup #21](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/21)
1728+
- [added switch to turn use of builtin LED off #20](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/20)
17231729

1730+
17241731
<table>
17251732
<tr>
17261733
<td align="center"><a href="https://github.com/bizprof"><img src="https://github.com/bizprof.png" width="100px;" alt="bizprof"/><br /><sub><b>⭐️⭐️ Michael H. "bizprof"</b></sub></a><br /></td>
1734+
<td align="center"><a href="https://github.com/hmueller01"><img src="https://github.com/hmueller01.png" width="100px;" alt="hmueller01"/><br /><sub><b>Holger Müller</b></sub></a><br /></td>
17271735
</tr>
17281736
</table>
17291737

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434

3535
## Changelog
3636

37+
### Release v1.10.0
38+
39+
1. Add Captive-Portal feature. Check [Captive portal #24](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/24)
40+
2. Add option to not `USE_LED_BUILTIN` for Config-Portal. Check [added switch to turn use of builtin LED off #20](https://github.com/khoih-prog/ESP_WiFiManager_Lite/pull/20)
41+
3. Code clean-up
42+
3743
### Release v1.9.0
3844

3945
1. Fix ESP32 chipID. Check [Help for storing variables in memory (non-volatile) #87](https://github.com/khoih-prog/ESP_WiFiManager/discussions/87#discussioncomment-3593028)

keywords.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ WM_HTTP_EXPIRES LITERAL1
9090
WM_HTTP_CORS LITERAL1
9191
WM_HTTP_CORS_ALLOW_ALL LITERAL1
9292

93+
USE_LED_BUILTIN LITERAL1
94+
9395
LED_ON LITERAL1
9496
LED_OFF LITERAL1
9597

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ESP_WiFiManager_Lite",
3-
"version": "1.9.0",
3+
"version": "1.10.0",
44
"keywords": "wifi, wi-fi, MultiWiFi, multi-wifi, WiFiManager, esp8266, esp32, esp32-s2, esp32-s3, esp32-c3, Communication, iot, credentials, persistent, config-portal, DoubleReset, MultiReset, DoubleResetDetector, littlefs, spiffs, eeprom, light-weight",
55
"description": "Library to configure MultiWiFi/Credentials at runtime for ESP32 (including ESP32-S2, ESP32-S3 and ESP32-C3) and ESP8266 boards. You can also specify DHCP HostName, static AP and STA IP. Use much less memory compared to full-fledge WiFiManager. Config Portal will be auto-adjusted to match the number of dynamic custom parameters. Optional default Credentials to be autoloaded into Config Portal to use or change instead of manually input. Credentials are saved in LittleFS, SPIFFS or EEPROM. New powerful-yet-simple-to-use feature to enable adding dynamic custom parameters from sketch and input using the same Config Portal. Double or MultiDetectDetector as well as Virtual Switches feature permits entering Config Portal as requested. Configurable Customs HTML Headers, including Customs Style, Customs Head Elements, CORS Header. Now using correct ESP32 chipIP",
66
"authors":

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP_WiFiManager_Lite
2-
version=1.9.0
2+
version=1.10.0
33
author=Khoi Hoang
44
maintainer=Khoi Hoang <khoih.prog@gmail.com>
55
license=MIT

0 commit comments

Comments
 (0)