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

Commit

Permalink
v1.1.1
Browse files Browse the repository at this point in the history
### 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)
  • Loading branch information
khoih-prog authored Feb 1, 2021
1 parent ccd0594 commit e9f42df
Show file tree
Hide file tree
Showing 41 changed files with 1,523 additions and 1,058 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Please ensure to specify the following:
Arduino IDE version: 1.8.13
ESP32 Core Version 1.0.4
OS: Ubuntu 20.04 LTS
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
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
Context:
The board couldn't autoreconnect to Local Blynk Server after router power recycling.
Expand Down
177 changes: 174 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* [Features](#features)
* [Currently supported Boards](#currently-supported-boards)
* [Changelog](#changelog)
* [Releases v1.1.1](#releases-v111)
* [Major Releases v1.1.0](#major-releases-v110)
* [Major Releases v1.0.6](#major-releases-v106)
* [Major Releases v1.0.5](#major-releases-v105)
Expand Down Expand Up @@ -63,6 +64,8 @@
* [1.1. No Config Data => Config Portal. Input valid credentials => reboot](#11-no-config-data--config-portal-input-valid-credentials--reboot)
* [1.2. DRD => Config Portal. Input valid credentials => reboot](#12-drd--config-portal-input-valid-credentials--reboot)
* [1.3. After inputting valid credentials and reboot](#13-after-inputting-valid-credentials-and-reboot)
* [1.4. Enter non-persistent ConfigPortal](#14-enter-non-persistent-configportal)
* [1.5. Enter persistent ConfigPortal](#15-enter-persistent-configportal)
* [Debug](#debug)
* [Troubleshooting](#troubleshooting)
* [Releases](#releases)
Expand Down Expand Up @@ -124,6 +127,12 @@ This [**BlynkESP32_BT_WF** library](https://github.com/khoih-prog/BlynkESP32_BT_

## Changelog

### 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](https://github.com/khoih-prog/Blynk_WM/issues/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**](https://github.com/khoih-prog/Blynk_WM/issues/27)

### Major Releases v1.1.0

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

```
Starting ESP32_BLE_WF using SPIFFS without SSL on ESP32_DEV
BlynkESP32_BT_WF v1.1.0
BlynkESP32_BT_WF v1.1.1
ESP_DoubleResetDetector v1.1.1
GPIO14 HIGH, Use WiFi
USE_BLYNK_WM: Blynk_WF begin
Expand Down Expand Up @@ -1136,7 +1145,7 @@ FF[9799112] id: = HueNet1

```
Starting ESP32_BLE_WF using SPIFFS without SSL on ESP32_DEV
BlynkESP32_BT_WF v1.1.0
BlynkESP32_BT_WF v1.1.1
ESP_DoubleResetDetector v1.1.1
GPIO14 HIGH, Use WiFi
USE_BLYNK_WM: Blynk_WF begin
Expand Down Expand Up @@ -1214,7 +1223,7 @@ FFFFF

```
Starting ESP32_BLE_WF using SPIFFS without SSL on ESP32_DEV
BlynkESP32_BT_WF v1.1.0
BlynkESP32_BT_WF v1.1.1
ESP_DoubleResetDetector v1.1.1
GPIO14 HIGH, Use WiFi
USE_BLYNK_WM: Blynk_WF begin
Expand Down Expand Up @@ -1282,7 +1291,163 @@ Stop doubleResetDetecting
Saving config file...
Saving config file OK
BBBB
```

---

#### 1.4 Enter non-persistent ConfigPortal

**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.

```
CP Button Hit. Rebooting
[175599] setForcedCP non-Persistent
[175608] SaveCPFile
[175611] OK
[175620] SaveBkUpCPFile
[175624] OK
ets Jun 8 2016 00:22:57
Starting ESP32_BLE_WF using LITTLEFS without SSL on ESP32_DEV
BlynkESP32_BT_WF v1.1.1
ESP_DoubleResetDetector v1.1.1
GPIO14 HIGH, Use WiFi
USE_BLYNK_WM: Blynk_WF begin
LittleFS Flag read = 0xD0D04321
No doubleResetDetected
Saving config file...
Saving config file OK
[350] Hostname=GeigerCounter-BLE
[381] LoadCfgFile
[386] OK
[386] ======= Start Stored Config Data =======
[386] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
[386] SSID=HueNet1,PW=12345678
[386] SSID1=HueNet2,PW1=12345678
[389] Server=account.duckdns.org,Token=token
[395] Server1=account.duckdns.org,Token1=token1
[401] BT-Token=bt_token,BLE-Token=ble_token
[409] Port=8080
[411] ======= End Config Data =======
[414] CCSum=0x4b86,RCSum=0x4b86
[429] LoadCredFile
[434] CrR:pdata=new-mqtt-server,len=34
[434] CrR:pdata=1883,len=6
[434] CrR:pdata=default-mqtt-username,len=34
[434] CrR:pdata=default-mqtt-password,len=34
[437] CrR:pdata=default-mqtt-SubTopic,len=34
[441] CrR:pdata=default-mqtt-PubTopic,len=34
[445] OK
[446] CrCCsum=0x280b,CrRCsum=0x280b
[449] Valid Stored Dynamic Data
[452] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
[456] SSID=HueNet1,PW=12345678
[459] SSID1=HueNet2,PW1=12345678
[462] Server=account.duckdns.org,Token=token
[468] Server1=account.duckdns.org,Token1=token1
[474] BT-Token=bt_token,BLE-Token=ble_token
[482] Port=8080
[484] ======= End Config Data =======
[487] Check if isForcedCP
[500] LoadCPFile
[504] OK
[504] bg: isForcedConfigPortal = true
[504] bg:Stay forever in CP:Forced-non-Persistent
[504] clearForcedCP
[514] SaveCPFile
[518] OK
[528] SaveBkUpCPFile
[532] OK
[1377] stConf:SSID=TestPortal-ESP32,PW=TestPortalPass
[1377] IP=192.168.232.1,ch=9
F
Your stored Credentials :
MQTT Server = new-mqtt-server
Port = 1883
MQTT UserName = default-mqtt-username
MQTT PWD = default-mqtt-password
Subs Topics = default-mqtt-SubTopic
Pubs Topics = default-mqtt-PubTopic
Stop doubleResetDetecting
Saving config file...
Saving config file OK
F
```

---

#### 1.5 Enter persistent ConfigPortal

**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.

```
Persistent CP Button Hit. Rebooting
[10487] setForcedCP Persistent
[10500] SaveCPFile
[10505] OK
[10628] SaveBkUpCPFile
[10676] OK
ets Jun 8 2016 00:22:57
Starting ESP32_BLE_WF using LITTLEFS without SSL on ESP32_DEV
BlynkESP32_BT_WF v1.1.1
ESP_DoubleResetDetector v1.1.1
GPIO14 HIGH, Use WiFi
USE_BLYNK_WM: Blynk_WF begin
LittleFS Flag read = 0xD0D04321
No doubleResetDetected
Saving config file...
Saving config file OK
[399] Hostname=GeigerCounter-BLE
[421] LoadCfgFile
[425] OK
[425] ======= Start Stored Config Data =======
[425] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
[425] SSID=HueNet1,PW=12345678
[426] SSID1=HueNet2,PW1=12345678
[429] Server=account.duckdns.org,Token=token
[435] Server1=account.duckdns.org,Token1=token1
[441] BT-Token=bt_token,BLE-Token=ble_token
[449] Port=8080
[450] ======= End Config Data =======
[454] CCSum=0x4b86,RCSum=0x4b86
[465] LoadCredFile
[468] CrR:pdata=new-mqtt-server,len=34
[468] CrR:pdata=1883,len=6
[468] CrR:pdata=default-mqtt-username,len=34
[468] CrR:pdata=default-mqtt-password,len=34
[472] CrR:pdata=default-mqtt-SubTopic,len=34
[476] CrR:pdata=default-mqtt-PubTopic,len=34
[480] OK
[481] CrCCsum=0x280b,CrRCsum=0x280b
[485] Valid Stored Dynamic Data
[487] Hdr=ESP32_WFM,BrdName=ESP32_BT_BLE
[491] SSID=HueNet1,PW=12345678
[494] SSID1=HueNet2,PW1=12345678
[497] Server=account.duckdns.org,Token=token
[503] Server1=account.duckdns.org,Token1=token1
[509] BT-Token=bt_token,BLE-Token=ble_token
[517] Port=8080
[519] ======= End Config Data =======
[522] Check if isForcedCP
[532] LoadCPFile
[535] OK
[535] bg: isForcedConfigPortal = true
[535] bg:Stay forever in CP:Forced-Persistent
[1380] stConf:SSID=TestPortal-ESP32,PW=TestPortalPass
[1380] IP=192.168.232.1,ch=1
F
Your stored Credentials :
MQTT Server = new-mqtt-server
Port = 1883
MQTT UserName = default-mqtt-username
MQTT PWD = default-mqtt-password
Subs Topics = default-mqtt-SubTopic
Pubs Topics = default-mqtt-PubTopic
Stop doubleResetDetecting
Saving config file...
Saving config file OK
FFFF
```

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

## Releases

### 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](https://github.com/khoih-prog/Blynk_WM/issues/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**](https://github.com/khoih-prog/Blynk_WM/issues/27)

### Major Releases v1.1.0

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

#ifndef Credentials_h
Expand Down
Loading

0 comments on commit e9f42df

Please sign in to comment.