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

Commit 264ca44

Browse files
authored
v1.1.0
### Major Releases v1.1.0 1. Add support to LittleFS for ESP32 using [LITTLEFS](https://github.com/lorol/LITTLEFS) Library 2. Clean-up all compiler warnings possible. 3. Add Table of Contents 4. Add Version String
1 parent 1b8bc91 commit 264ca44

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

+802
-428
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
1414

1515
Please ensure to specify the following:
1616

17-
* Arduino IDE version (e.g. 1.8.11) or Platform.io version
17+
* Arduino IDE version (e.g. 1.8.13) or Platform.io version
1818
* `ESP32` Core Version (e.g. ESP32 core v1.0.4)
1919
* Contextual information (e.g. what you were trying to achieve)
2020
* Simplest possible steps to reproduce
@@ -26,10 +26,10 @@ Please ensure to specify the following:
2626
### Example
2727

2828
```
29-
Arduino IDE version: 1.8.11
29+
Arduino IDE version: 1.8.13
3030
ESP32 Core Version 1.0.4
31-
OS: Ubuntu 16.04 LTS
32-
Linux Inspiron 4.4.0-170-generic #199-Ubuntu SMP Thu Nov 14 01:45:04 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
31+
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
3333
3434
Context:
3535
The board couldn't autoreconnect to Local Blynk Server after router power recycling.

README.md

Lines changed: 257 additions & 77 deletions
Large diffs are not rendered by default.

examples/ESP32_BLE_WF/Credentials.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
Credentials.h
3-
For ESP32 boards
3+
For ESP32 using WiFi along with BlueTooth BLE
44
55
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
1111
12-
Version: 1.0.6
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,8 +20,9 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627

2728
#ifndef Credentials_h

examples/ESP32_BLE_WF/ESP32_BLE_WF.ino

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
1111
12-
Version: 1.0.6
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,8 +20,9 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627
/****************************************************************************************************************************
2728
Important Notes:
@@ -114,8 +115,10 @@ void setup()
114115
Serial.begin(115200);
115116
while (!Serial);
116117

117-
#if ( USE_SPIFFS)
118-
Serial.print(F("\nStarting ESP32_BLE_WF using SPIFFS"));
118+
#if (USE_LITTLEFS)
119+
Serial.print(F("\nStarting ESP32_BLE_WF using LITTLEFS"));
120+
#elif (USE_SPIFFS)
121+
Serial.print(F("\nStarting ESP32_BLE_WF using SPIFFS"));
119122
#else
120123
Serial.print(F("\nStarting ESP32_BLE_WF using EEPROM"));
121124
#endif
@@ -124,7 +127,13 @@ void setup()
124127
Serial.println(" with SSL on " + String(ARDUINO_BOARD));
125128
#else
126129
Serial.println(" without SSL on " + String(ARDUINO_BOARD));
127-
#endif
130+
#endif
131+
132+
Serial.println(BLYNK_ESP32_BT_WF_VERSION);
133+
134+
#if USE_BLYNK_WM
135+
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
136+
#endif
128137

129138
pinMode(WIFI_BLE_SELECTION_PIN, INPUT_PULLUP);
130139

examples/ESP32_BLE_WF/defines.h

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
defines.h
3-
For ESP32 boards
3+
For ESP32 using WiFi along with BlueTooth BLE
44
55
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
1111
12-
Version: 1.0.6
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,33 +20,37 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627

2728
#ifndef defines_h
2829
#define defines_h
2930

3031
#ifndef ESP32
31-
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
32+
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
3233
#endif
3334

34-
#define BLYNK_PRINT Serial
35+
#define BLYNK_PRINT Serial
3536

36-
#define ESP32_BLE_WF_DEBUG true
37+
#define ESP32_BLE_WF_DEBUG true
3738

3839
#define DOUBLERESETDETECTOR_DEBUG true
3940
#define BLYNK_WM_DEBUG 3
4041

41-
// Not use #define USE_SPIFFS => using EEPROM for configuration data in WiFiManager
42-
// #define USE_SPIFFS false => using EEPROM for configuration data in WiFiManager
43-
// #define USE_SPIFFS true => using SPIFFS for configuration data in WiFiManager
42+
// Not use #define USE_LITTLEFS and #define USE_SPIFFS => using SPIFFS for configuration data in WiFiManager
43+
// (USE_LITTLEFS == false) and (USE_SPIFFS == false) => using EEPROM for configuration data in WiFiManager
44+
// (USE_LITTLEFS == true) and (USE_SPIFFS == false) => using LITTLEFS for configuration data in WiFiManager
45+
// (USE_LITTLEFS == true) and (USE_SPIFFS == true) => using LITTLEFS for configuration data in WiFiManager
46+
// (USE_LITTLEFS == false) and (USE_SPIFFS == true) => using SPIFFS for configuration data in WiFiManager
4447
// Those above #define's must be placed before #include <BlynkSimpleEsp32_WFM.h>
4548

46-
#define USE_SPIFFS true
47-
//#define USE_SPIFFS false
49+
#define USE_LITTLEFS true
50+
#define USE_SPIFFS false
4851

49-
#if (!USE_SPIFFS)
52+
53+
#if !( USE_SPIFFS || USE_LITTLEFS)
5054
// EEPROM_SIZE must be <= 2048 and >= CONFIG_DATA_SIZE (currently 172 bytes)
5155
#define EEPROM_SIZE (2 * 1024)
5256
// EEPROM_START + CONFIG_DATA_SIZE must be <= EEPROM_SIZE
@@ -57,6 +61,7 @@
5761
#define TIMEOUT_RECONNECT_WIFI 10000L
5862
#define RESET_IF_CONFIG_TIMEOUT true
5963
#define CONFIG_TIMEOUT_RETRYTIMES_BEFORE_RESET 5
64+
6065
// Those above #define's must be placed before #include <BlynkSimpleESP32_WFM.h>
6166

6267
//#define BLYNK_USE_BLE_ONLY true

examples/ESP32_BLE_WF/dynamicParams.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
dynamicParams.h
3-
For ESP32 boards
3+
For ESP32 using WiFi along with BlueTooth BLE
44
55
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
1111
12-
Version: 1.0.6
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,8 +20,9 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627

2728
#ifndef dynamicParams_h

examples/ESP32_BT_WF/Credentials.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
Credentials.h
3-
For ESP32 boards
3+
For ESP32 using WiFi along with BlueTooth BLE
44
55
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
11-
12-
Version: 1.0.6
11+
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,8 +20,9 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627

2728
#ifndef Credentials_h

examples/ESP32_BT_WF/ESP32_BT_WF.ino

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
ESP32_BT_WF.ino
3-
For ESP32 using WiFi along with BlueTooth BT
3+
For ESP32 using WiFi along with BlueTooth BLE
44
55
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
1111
12-
Version: 1.0.6
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,8 +20,9 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627
/****************************************************************************************************************************
2728
Important Notes:
@@ -114,17 +115,25 @@ void setup()
114115
Serial.begin(115200);
115116
while (!Serial);
116117

117-
#if ( USE_SPIFFS)
118-
Serial.print(F("\nStarting ESP32_BT_WF using SPIFFS"));
118+
#if (USE_LITTLEFS)
119+
Serial.print(F("\nStarting ESP32_BLE_WF using LITTLEFS"));
120+
#elif (USE_SPIFFS)
121+
Serial.print(F("\nStarting ESP32_BLE_WF using SPIFFS"));
119122
#else
120-
Serial.print(F("\nStarting ESP32_BT_WF using EEPROM"));
123+
Serial.print(F("\nStarting ESP32_BLE_WF using EEPROM"));
121124
#endif
122125

123126
#if USE_SSL
124127
Serial.println(" with SSL on " + String(ARDUINO_BOARD));
125128
#else
126129
Serial.println(" without SSL on " + String(ARDUINO_BOARD));
127-
#endif
130+
#endif
131+
132+
Serial.println(BLYNK_ESP32_BT_WF_VERSION);
133+
134+
#if USE_BLYNK_WM
135+
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
136+
#endif
128137

129138
pinMode(WIFI_BT_SELECTION_PIN, INPUT_PULLUP);
130139

examples/ESP32_BT_WF/defines.h

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/****************************************************************************************************************************
22
defines.h
3-
For ESP32 boards
3+
For ESP32 using WiFi along with BlueTooth BLE
44
55
BlynkESP32_BT_WF is a library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries.
66
Then select either one or both at runtime.
77
88
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/BlynkGSM_ESPManager
9+
Built by Khoi Hoang https://github.com/khoih-prog/BlynkESP32_BT_WF
1010
Licensed under MIT license
11-
12-
Version: 1.0.6
11+
12+
Version: 1.1.0
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,33 +20,37 @@
2020
1.0.4 K Hoang 14/03/2020 Enhance GUI. Reduce code size.
2121
1.0.5 K Hoang 18/04/2020 MultiWiFi/Blynk. Dynamic custom parameters. SSID password maxlen is 63 now.
2222
Permit special chars # and % in input data.
23-
1.0.6 K Hoang 24/04/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATAa and DRD.
23+
1.0.6 K Hoang 24/08/2020 Add Configurable Config Portal Title, Add USE_DEFAULT_CONFIG_DATA and DRD.
2424
Auto format SPIFFS. Update examples.
25+
1.1.0 K Hoang 30/12/2020 Add support to LittleFS. Remove possible compiler warnings. Update examples
2526
*****************************************************************************************************************************/
2627

2728
#ifndef defines_h
2829
#define defines_h
2930

3031
#ifndef ESP32
31-
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
32+
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
3233
#endif
3334

34-
#define BLYNK_PRINT Serial
35+
#define BLYNK_PRINT Serial
3536

36-
#define ESP32_BLE_WF_DEBUG true
37+
#define ESP32_BLE_WF_DEBUG true
3738

3839
#define DOUBLERESETDETECTOR_DEBUG true
3940
#define BLYNK_WM_DEBUG 3
4041

41-
// Not use #define USE_SPIFFS => using EEPROM for configuration data in WiFiManager
42-
// #define USE_SPIFFS false => using EEPROM for configuration data in WiFiManager
43-
// #define USE_SPIFFS true => using SPIFFS for configuration data in WiFiManager
42+
// Not use #define USE_LITTLEFS and #define USE_SPIFFS => using SPIFFS for configuration data in WiFiManager
43+
// (USE_LITTLEFS == false) and (USE_SPIFFS == false) => using EEPROM for configuration data in WiFiManager
44+
// (USE_LITTLEFS == true) and (USE_SPIFFS == false) => using LITTLEFS for configuration data in WiFiManager
45+
// (USE_LITTLEFS == true) and (USE_SPIFFS == true) => using LITTLEFS for configuration data in WiFiManager
46+
// (USE_LITTLEFS == false) and (USE_SPIFFS == true) => using SPIFFS for configuration data in WiFiManager
4447
// Those above #define's must be placed before #include <BlynkSimpleEsp32_WFM.h>
4548

46-
#define USE_SPIFFS true
47-
//#define USE_SPIFFS false
49+
#define USE_LITTLEFS true
50+
#define USE_SPIFFS false
51+
4852

49-
#if (!USE_SPIFFS)
53+
#if !( USE_SPIFFS || USE_LITTLEFS)
5054
// EEPROM_SIZE must be <= 2048 and >= CONFIG_DATA_SIZE (currently 172 bytes)
5155
#define EEPROM_SIZE (2 * 1024)
5256
// EEPROM_START + CONFIG_DATA_SIZE must be <= EEPROM_SIZE
@@ -57,10 +61,11 @@
5761
#define TIMEOUT_RECONNECT_WIFI 10000L
5862
#define RESET_IF_CONFIG_TIMEOUT true
5963
#define CONFIG_TIMEOUT_RETRYTIMES_BEFORE_RESET 5
64+
6065
// Those above #define's must be placed before #include <BlynkSimpleESP32_WFM.h>
6166

62-
//#define BLYNK_USE_BT_ONLY true
63-
#define BLYNK_USE_BT_ONLY false
67+
//#define BLYNK_USE_BLE_ONLY true
68+
#define BLYNK_USE_BLE_ONLY false
6469

6570
#include <BlynkSimpleEsp32_BT_WF.h>
6671

0 commit comments

Comments
 (0)