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

Commit e9f42df

Browse files
authored
v1.1.1
### Releases v1.1.1 1. Add functions to control Config Portal from software or Virtual Switches. Check [How to trigger a Config Portal from code #25](khoih-prog/Blynk_WM#25) 2. Fix rare Config Portal bug not updating Config and dynamic Params data successfully in very noisy or weak WiFi situation 3. To permit autoreset after configurable timeout if DRD/MRD or non-persistent forced-CP. Check [**Good new feature: Blynk.resetAndEnterConfigPortal() Thanks & question #27**](khoih-prog/Blynk_WM#27)
1 parent ccd0594 commit e9f42df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1523
-1058
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please ensure to specify the following:
2929
Arduino IDE version: 1.8.13
3030
ESP32 Core Version 1.0.4
3131
OS: Ubuntu 20.04 LTS
32-
Linux xy-Inspiron-3593 5.4.0-51-generic #56-Ubuntu SMP Mon Oct 5 14:28:49 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux
32+
Linux xy-Inspiron-3593 5.4.0-64-generic #72-Ubuntu SMP Fri Jan 15 10:27:54 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
3333
3434
Context:
3535
The board couldn't autoreconnect to Local Blynk Server after router power recycling.

README.md

Lines changed: 174 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* [Features](#features)
1818
* [Currently supported Boards](#currently-supported-boards)
1919
* [Changelog](#changelog)
20+
* [Releases v1.1.1](#releases-v111)
2021
* [Major Releases v1.1.0](#major-releases-v110)
2122
* [Major Releases v1.0.6](#major-releases-v106)
2223
* [Major Releases v1.0.5](#major-releases-v105)
@@ -63,6 +64,8 @@
6364
* [1.1. No Config Data => Config Portal. Input valid credentials => reboot](#11-no-config-data--config-portal-input-valid-credentials--reboot)
6465
* [1.2. DRD => Config Portal. Input valid credentials => reboot](#12-drd--config-portal-input-valid-credentials--reboot)
6566
* [1.3. After inputting valid credentials and reboot](#13-after-inputting-valid-credentials-and-reboot)
67+
* [1.4. Enter non-persistent ConfigPortal](#14-enter-non-persistent-configportal)
68+
* [1.5. Enter persistent ConfigPortal](#15-enter-persistent-configportal)
6669
* [Debug](#debug)
6770
* [Troubleshooting](#troubleshooting)
6871
* [Releases](#releases)
@@ -124,6 +127,12 @@ This [**BlynkESP32_BT_WF** library](https://github.com/khoih-prog/BlynkESP32_BT_
124127

125128
## Changelog
126129

130+
### Releases v1.1.1
131+
132+
1. Add functions to control Config Portal from software or Virtual Switches. Check [How to trigger a Config Portal from code #25](https://github.com/khoih-prog/Blynk_WM/issues/25)
133+
2. Fix rare Config Portal bug not updating Config and dynamic Params data successfully in very noisy or weak WiFi situation
134+
3. To permit autoreset after configurable timeout if DRD/MRD or non-persistent forced-CP. Check [**Good new feature: Blynk.resetAndEnterConfigPortal() Thanks & question #27**](https://github.com/khoih-prog/Blynk_WM/issues/27)
135+
127136
### Major Releases v1.1.0
128137

129138
1. Add support to LittleFS for ESP32 using [LITTLEFS](https://github.com/lorol/LITTLEFS) Library
@@ -1078,7 +1087,7 @@ The following is the sample terminal output when running example [ESP32_BLE_WF](
10781087

10791088
```
10801089
Starting ESP32_BLE_WF using SPIFFS without SSL on ESP32_DEV
1081-
BlynkESP32_BT_WF v1.1.0
1090+
BlynkESP32_BT_WF v1.1.1
10821091
ESP_DoubleResetDetector v1.1.1
10831092
GPIO14 HIGH, Use WiFi
10841093
USE_BLYNK_WM: Blynk_WF begin
@@ -1136,7 +1145,7 @@ FF[9799112] id: = HueNet1
11361145

11371146
```
11381147
Starting ESP32_BLE_WF using SPIFFS without SSL on ESP32_DEV
1139-
BlynkESP32_BT_WF v1.1.0
1148+
BlynkESP32_BT_WF v1.1.1
11401149
ESP_DoubleResetDetector v1.1.1
11411150
GPIO14 HIGH, Use WiFi
11421151
USE_BLYNK_WM: Blynk_WF begin
@@ -1214,7 +1223,7 @@ FFFFF
12141223

12151224
```
12161225
Starting ESP32_BLE_WF using SPIFFS without SSL on ESP32_DEV
1217-
BlynkESP32_BT_WF v1.1.0
1226+
BlynkESP32_BT_WF v1.1.1
12181227
ESP_DoubleResetDetector v1.1.1
12191228
GPIO14 HIGH, Use WiFi
12201229
USE_BLYNK_WM: Blynk_WF begin
@@ -1282,7 +1291,163 @@ Stop doubleResetDetecting
12821291
Saving config file...
12831292
Saving config file OK
12841293
BBBB
1294+
```
1295+
1296+
---
1297+
1298+
#### 1.4 Enter non-persistent ConfigPortal
1299+
1300+
**Non-Persistent CP will be removed after first reset or time-out, even you didn't enter the CP**. You can optionally enter CP, input and `Save` config data.
1301+
1302+
```
1303+
CP Button Hit. Rebooting
1304+
[175599] setForcedCP non-Persistent
1305+
[175608] SaveCPFile
1306+
[175611] OK
1307+
[175620] SaveBkUpCPFile
1308+
[175624] OK
1309+
ets Jun 8 2016 00:22:57
1310+
1311+
Starting ESP32_BLE_WF using LITTLEFS without SSL on ESP32_DEV
1312+
BlynkESP32_BT_WF v1.1.1
1313+
ESP_DoubleResetDetector v1.1.1
1314+
GPIO14 HIGH, Use WiFi
1315+
USE_BLYNK_WM: Blynk_WF begin
1316+
LittleFS Flag read = 0xD0D04321
1317+
No doubleResetDetected
1318+
Saving config file...
1319+
Saving config file OK
1320+
[350] Hostname=GeigerCounter-BLE
1321+
[381] LoadCfgFile
1322+
[386] OK
1323+
[386] ======= Start Stored Config Data =======
1324+
[386] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
1325+
[386] SSID=HueNet1,PW=12345678
1326+
[386] SSID1=HueNet2,PW1=12345678
1327+
[389] Server=account.duckdns.org,Token=token
1328+
[395] Server1=account.duckdns.org,Token1=token1
1329+
[401] BT-Token=bt_token,BLE-Token=ble_token
1330+
[409] Port=8080
1331+
[411] ======= End Config Data =======
1332+
[414] CCSum=0x4b86,RCSum=0x4b86
1333+
[429] LoadCredFile
1334+
[434] CrR:pdata=new-mqtt-server,len=34
1335+
[434] CrR:pdata=1883,len=6
1336+
[434] CrR:pdata=default-mqtt-username,len=34
1337+
[434] CrR:pdata=default-mqtt-password,len=34
1338+
[437] CrR:pdata=default-mqtt-SubTopic,len=34
1339+
[441] CrR:pdata=default-mqtt-PubTopic,len=34
1340+
[445] OK
1341+
[446] CrCCsum=0x280b,CrRCsum=0x280b
1342+
[449] Valid Stored Dynamic Data
1343+
[452] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
1344+
[456] SSID=HueNet1,PW=12345678
1345+
[459] SSID1=HueNet2,PW1=12345678
1346+
[462] Server=account.duckdns.org,Token=token
1347+
[468] Server1=account.duckdns.org,Token1=token1
1348+
[474] BT-Token=bt_token,BLE-Token=ble_token
1349+
[482] Port=8080
1350+
[484] ======= End Config Data =======
1351+
[487] Check if isForcedCP
1352+
[500] LoadCPFile
1353+
[504] OK
1354+
[504] bg: isForcedConfigPortal = true
1355+
[504] bg:Stay forever in CP:Forced-non-Persistent
1356+
[504] clearForcedCP
1357+
[514] SaveCPFile
1358+
[518] OK
1359+
[528] SaveBkUpCPFile
1360+
[532] OK
1361+
[1377] stConf:SSID=TestPortal-ESP32,PW=TestPortalPass
1362+
[1377] IP=192.168.232.1,ch=9
1363+
F
1364+
Your stored Credentials :
1365+
MQTT Server = new-mqtt-server
1366+
Port = 1883
1367+
MQTT UserName = default-mqtt-username
1368+
MQTT PWD = default-mqtt-password
1369+
Subs Topics = default-mqtt-SubTopic
1370+
Pubs Topics = default-mqtt-PubTopic
1371+
Stop doubleResetDetecting
1372+
Saving config file...
1373+
Saving config file OK
1374+
F
1375+
```
1376+
1377+
---
1378+
1379+
#### 1.5 Enter persistent ConfigPortal
1380+
1381+
**Persistent CP will remain even after resets or time-out**. The only way to get rid of Config Portal is to enter CP, input (even fake data or none) and `Save` config data. So be careful to use this feature.
12851382

1383+
```
1384+
Persistent CP Button Hit. Rebooting
1385+
[10487] setForcedCP Persistent
1386+
[10500] SaveCPFile
1387+
[10505] OK
1388+
[10628] SaveBkUpCPFile
1389+
[10676] OK
1390+
ets Jun 8 2016 00:22:57
1391+
1392+
Starting ESP32_BLE_WF using LITTLEFS without SSL on ESP32_DEV
1393+
BlynkESP32_BT_WF v1.1.1
1394+
ESP_DoubleResetDetector v1.1.1
1395+
GPIO14 HIGH, Use WiFi
1396+
USE_BLYNK_WM: Blynk_WF begin
1397+
LittleFS Flag read = 0xD0D04321
1398+
No doubleResetDetected
1399+
Saving config file...
1400+
Saving config file OK
1401+
[399] Hostname=GeigerCounter-BLE
1402+
[421] LoadCfgFile
1403+
[425] OK
1404+
[425] ======= Start Stored Config Data =======
1405+
[425] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
1406+
[425] SSID=HueNet1,PW=12345678
1407+
[426] SSID1=HueNet2,PW1=12345678
1408+
[429] Server=account.duckdns.org,Token=token
1409+
[435] Server1=account.duckdns.org,Token1=token1
1410+
[441] BT-Token=bt_token,BLE-Token=ble_token
1411+
[449] Port=8080
1412+
[450] ======= End Config Data =======
1413+
[454] CCSum=0x4b86,RCSum=0x4b86
1414+
[465] LoadCredFile
1415+
[468] CrR:pdata=new-mqtt-server,len=34
1416+
[468] CrR:pdata=1883,len=6
1417+
[468] CrR:pdata=default-mqtt-username,len=34
1418+
[468] CrR:pdata=default-mqtt-password,len=34
1419+
[472] CrR:pdata=default-mqtt-SubTopic,len=34
1420+
[476] CrR:pdata=default-mqtt-PubTopic,len=34
1421+
[480] OK
1422+
[481] CrCCsum=0x280b,CrRCsum=0x280b
1423+
[485] Valid Stored Dynamic Data
1424+
[487] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
1425+
[491] SSID=HueNet1,PW=12345678
1426+
[494] SSID1=HueNet2,PW1=12345678
1427+
[497] Server=account.duckdns.org,Token=token
1428+
[503] Server1=account.duckdns.org,Token1=token1
1429+
[509] BT-Token=bt_token,BLE-Token=ble_token
1430+
[517] Port=8080
1431+
[519] ======= End Config Data =======
1432+
[522] Check if isForcedCP
1433+
[532] LoadCPFile
1434+
[535] OK
1435+
[535] bg: isForcedConfigPortal = true
1436+
[535] bg:Stay forever in CP:Forced-Persistent
1437+
[1380] stConf:SSID=TestPortal-ESP32,PW=TestPortalPass
1438+
[1380] IP=192.168.232.1,ch=1
1439+
F
1440+
Your stored Credentials :
1441+
MQTT Server = new-mqtt-server
1442+
Port = 1883
1443+
MQTT UserName = default-mqtt-username
1444+
MQTT PWD = default-mqtt-password
1445+
Subs Topics = default-mqtt-SubTopic
1446+
Pubs Topics = default-mqtt-PubTopic
1447+
Stop doubleResetDetecting
1448+
Saving config file...
1449+
Saving config file OK
1450+
FFFF
12861451
```
12871452

12881453
---
@@ -1316,6 +1481,12 @@ Sometimes, the library will only work if you update the board core to the latest
13161481

13171482
## Releases
13181483

1484+
### Releases v1.1.1
1485+
1486+
1. Add functions to control Config Portal from software or Virtual Switches. Check [How to trigger a Config Portal from code #25](https://github.com/khoih-prog/Blynk_WM/issues/25)
1487+
2. Fix rare Config Portal bug not updating Config and dynamic Params data successfully in very noisy or weak WiFi situation
1488+
3. To permit autoreset after configurable timeout if DRD/MRD or non-persistent forced-CP. Check [**Good new feature: Blynk.resetAndEnterConfigPortal() Thanks & question #27**](https://github.com/khoih-prog/Blynk_WM/issues/27)
1489+
13191490
### Major Releases v1.1.0
13201491

13211492
1. Add support to LittleFS for ESP32 using [LITTLEFS](https://github.com/lorol/LITTLEFS) Library

examples/ESP32_BLE_WF/Credentials.h

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,13 @@
11
/****************************************************************************************************************************
2-
Credentials.h
3-
For ESP32 using WiFi along with BlueTooth BLE
4-
5-
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
6-
Then select either one or both at runtime.
7-
8-
Based on and modified from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases
9-
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
10-
Licensed under MIT license
11-
12-
Version: 1.1.0
13-
14-
Version Modified By Date Comments
15-
------- ----------- ---------- -----------
16-
1.0.0 K Hoang 25/01/2020 Initial coding
17-
1.0.1 K Hoang 27/01/2020 Enable simultaneously running BT/BLE and WiFi
18-
1.0.2 K Hoang 04/02/2020 Add Blynk WiFiManager support similar to Blynk_WM library
19-
1.0.3 K Hoang 24/02/2020 Add checksum, clearConfigData()
20-
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
21-
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
22-
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
24-
Auto format SPIFFS. Update examples.
25-
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2+
Credentials.h
3+
For ESP32 using WiFi along with BlueTooth BLE
4+
5+
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
6+
Then select either one or both at runtime.
7+
8+
Based on and modified from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
10+
Licensed under MIT license
2611
*****************************************************************************************************************************/
2712

2813
#ifndef Credentials_h

0 commit comments

Comments
 (0)