From ea7f60110e510db9c40e923958ab89cdd3f5cd08 Mon Sep 17 00:00:00 2001 From: Khoi Hoang <57012152+khoih-prog@users.noreply.github.com> Date: Sun, 25 Apr 2021 17:48:29 -0400 Subject: [PATCH] v1.5.0 ### Releases v1.5.0 1. Fix bug. 2. Optimize and sync with [**Blynk_Async_WM library v1.5.0**](https://github.com/khoih-prog/Blynk_Async_WM) --- README.md | 71 +++++++---- .../AM2315_ESP32_SSL/AM2315_ESP32_SSL.ino | 3 +- examples/AM2315_ESP32_SSL/defines.h | 2 + examples/AM2315_ESP8266/AM2315_ESP8266.ino | 3 +- examples/AM2315_ESP8266/defines.h | 2 + .../Blynk_WM_Template/Blynk_WM_Template.ino | 5 +- examples/DHT11ESP32/DHT11ESP32.ino | 3 +- examples/DHT11ESP32/defines.h | 2 + examples/DHT11ESP32_SSL/DHT11ESP32_SSL.ino | 3 +- examples/DHT11ESP32_SSL/defines.h | 2 + examples/DHT11ESP8266/DHT11ESP8266.ino | 3 +- examples/DHT11ESP8266/defines.h | 2 + .../DHT11ESP8266_Debug/DHT11ESP8266_Debug.ino | 3 +- examples/DHT11ESP8266_Debug/defines.h | 2 + .../DHT11ESP8266_SSL/DHT11ESP8266_SSL.ino | 3 +- examples/DHT11ESP8266_SSL/defines.h | 2 + examples/ESP32WM_Config/ESP32WM_Config.ino | 3 +- examples/ESP32WM_Config/defines.h | 2 + .../ESP32WM_ForcedConfig.ino | 3 +- examples/ESP32WM_ForcedConfig/defines.h | 2 + .../ESP32WM_MRD_Config/ESP32WM_MRD_Config.ino | 3 +- examples/ESP32WM_MRD_Config/defines.h | 2 + .../ESP32WM_MRD_ForcedConfig.ino | 3 +- examples/ESP32WM_MRD_ForcedConfig/defines.h | 4 +- .../ESP8266WM_Config/ESP8266WM_Config.ino | 3 +- examples/ESP8266WM_Config/defines.h | 2 + .../ESP8266WM_ForcedConfig.ino | 3 +- examples/ESP8266WM_ForcedConfig/defines.h | 2 + .../ESP8266WM_MRD_Config.ino | 3 +- examples/ESP8266WM_MRD_Config/defines.h | 2 + .../ESP8266WM_MRD_ForcedConfig.ino | 3 +- examples/ESP8266WM_MRD_ForcedConfig/defines.h | 2 + library.json | 2 +- library.properties | 2 +- src/BlynkSimpleEsp32_SSL_WM.h | 69 ++++++----- src/BlynkSimpleEsp32_WM.h | 113 ++++++------------ src/BlynkSimpleEsp8266_SSL_WM.h | 67 ++++++----- src/BlynkSimpleEsp8266_WM.h | 110 ++++++----------- 38 files changed, 262 insertions(+), 254 deletions(-) diff --git a/README.md b/README.md index 790a835..b43265d 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,8 @@ * [15. **ESP32WM_MRD_ForcedConfig**](examples/ESP32WM_MRD_ForcedConfig) * [16. **ESP8266WM_MRD_ForcedConfig**](examples/ESP8266WM_MRD_ForcedConfig) * [So, how it works?](#so-how-it-works) + * [ 1. Without SCAN_WIFI_NETWORKS](#1-without-scan_wifi_networks) + * [ 2. With SCAN_WIFI_NETWORKS]](#2-with-scan_wifi_networks) * [Example ESP32WM_MRD_ForcedConfig](#example-esp32wm_mrd_forcedconfig) * [1. File ESP32WM_MRD_ForcedConfig.ino](#1-file-esp32wm_mrd_forcedconfigino) * [2. File defines.h](#2-file-definesh) @@ -188,7 +190,7 @@ With version `v1.0.5` or later, you can configure: #### Currently supported Boards -This [**BlynkESP32_BT_WF** library](https://github.com/khoih-prog/BlynkESP32_BT_WF) currently supports these following boards: +This [**Blynk_WM** library](https://github.com/khoih-prog/Blynk_WM) currently supports these following boards: 1. **ESP8266 and ESP32-based boards using EEPROM, SPIFFS or LittleFS**. 2. **ESP32-S2 (ESP32-S2 Saola, AI-Thinker ESP-12K, etc.) using EEPROM, SPIFFS or LittleFS**. @@ -200,6 +202,12 @@ This [**BlynkESP32_BT_WF** library](https://github.com/khoih-prog/BlynkESP32_BT_ ## Changelog +### Releases v1.5.0 + +1. Fix bug. +2. Optimize and sync with [**Blynk_Async_WM library v1.5.0**](https://github.com/khoih-prog/Blynk_Async_WM) + + ### Major Releases v1.4.0 1. 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). Now you can select optional **SCAN_WIFI_NETWORKS**, **MANUAL_SSID_INPUT_ALLOWED** to be able to manually input SSID, not only from a scanned SSID lists and **MAX_SSID_IN_LIST** (from 2-15) @@ -1349,6 +1357,7 @@ void loop() #else #define BOARD_TYPE "ESP32" #endif + #define BLYNK_PRINT Serial #define BLYNK_WM_DEBUG 3 @@ -1398,7 +1407,7 @@ void loop() #define USE_LITTLEFS false #define USE_SPIFFS true #else - #define USE_LITTLEFS true + #define USE_LITTLEFS false #define USE_SPIFFS false #endif @@ -1428,6 +1437,21 @@ void loop() #define CONFIG_TIMEOUT 120000L #define USE_DYNAMIC_PARAMETERS true + +///////////////////////////////////////////// + +#define REQUIRE_ONE_SET_SSID_PW false + +#define SCAN_WIFI_NETWORKS true + +// To be able to manually input SSID, not from a scanned SSID lists +#define MANUAL_SSID_INPUT_ALLOWED true + +// From 2-15 +#define MAX_SSID_IN_LIST 8 + +///////////////////////////////////////////// + // Those above #define's must be placed before #include and ////////////////////////////////////////// @@ -1619,7 +1643,7 @@ The following is the sample terminal output when running example [ESP8266WM_MRD_ ``` Starting ESP8266WM_MRD_Config using LittleFS with SSL on ESP8266_NODEMCU -Blynk_WM SSL for ESP8266 v1.4.0 +Blynk_WM SSL for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFD0002 multiResetDetectorFlag = 0xFFFD0002 @@ -1699,7 +1723,7 @@ BBBBBB ``` Starting ESP8266WM_MRD_Config using LittleFS with SSL on ESP8266_NODEMCU -Blynk_WM SSL for ESP8266 v1.4.0 +Blynk_WM SSL for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFC0003 multiResetDetectorFlag = 0xFFFC0003 @@ -1761,7 +1785,7 @@ The following is the sample terminal output when running example [DHT11ESP8266_S ``` Starting DHT11ESP8266_SSL using LittleFS with SSL on ESP8266_NODEMCU -Blynk_WM SSL for ESP8266 v1.4.0 +Blynk_WM SSL for ESP8266 v1.5.0 ESP_DoubleResetDetector v1.1.1 [293] Hostname=ESP8266-DHT11-SSL [316] LoadCfgFile @@ -1819,7 +1843,7 @@ The following is the sample terminal output when running example [ESP32WM_MRD_Co ``` Starting ESP32WM_MRD_Config using LITTLEFS without SSL on ESP32_DEV -Blynk_WM for ESP32 v1.4.0 +Blynk_WM for ESP32 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFE0001 multiResetDetectorFlag = 0xFFFE0001 @@ -1896,7 +1920,7 @@ BBBBBB ``` Starting ESP32WM_MRD_Config using LITTLEFS without SSL on ESP32_DEV -Blynk_WM for ESP32 v1.4.0 +Blynk_WM for ESP32 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFC0003 multiResetDetectorFlag = 0xFFFC0003 @@ -1954,7 +1978,7 @@ ets Jun 8 2016 00:22:57 ``` Starting ESP32WM_MRD_Config using LITTLEFS without SSL on ESP32_DEV -Blynk_WM for ESP32 v1.4.0 +Blynk_WM for ESP32 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFE0001 multiResetDetectorFlag = 0xFFFE0001 @@ -2078,7 +2102,7 @@ The following is the sample terminal output when running example [DHT11ESP8266_S ``` Starting DHT11ESP32_SSL using LITTLEFS with SSL on ESP32_DEV -Blynk_WM SSL for ESP32 v1.4.0 +Blynk_WM SSL for ESP32 v1.5.0 ESP_DoubleResetDetector v1.1.1 [346] Hostname=ESP32-DHT11-SSL [385] LoadCfgFile @@ -2142,7 +2166,7 @@ Blynk.resetAndEnterConfigPortal(); ``` Starting ESP8266WM_MRD_ForcedConfig using LittleFS without SSL on ESP8266_NODEMCU -Blynk_WM for ESP8266 v1.4.0 +Blynk_WM for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFE0001 multiResetDetectorFlag = 0xFFFE0001 @@ -2228,7 +2252,7 @@ Non-Persistent CP will be removed after first reset, even you didn't enter the C ``` Starting ESP8266WM_MRD_ForcedConfig using LittleFS without SSL on ESP8266_NODEMCU -Blynk_WM for ESP8266 v1.4.0 +Blynk_WM for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFE0001 multiResetDetectorFlag = 0xFFFE0001 @@ -2310,7 +2334,7 @@ Blynk.resetAndEnterConfigPortalPersistent(); ``` Starting ESP8266WM_MRD_ForcedConfig using LittleFS without SSL on ESP8266_NODEMCU -Blynk_WM for ESP8266 v1.4.0 +Blynk_WM for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFE0001 multiResetDetectorFlag = 0xFFFE0001 @@ -2397,7 +2421,7 @@ Persistent CP will remain after resets. The only way to get rid of Config Portal ``` Starting ESP8266WM_MRD_ForcedConfig using LittleFS without SSL on ESP8266_NODEMCU -Blynk_WM for ESP8266 v1.4.0 +Blynk_WM for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 LittleFS Flag read = 0xFFFE0001 multiResetDetectorFlag = 0xFFFE0001 @@ -2465,7 +2489,7 @@ The following is the sample terminal output when running example [ESP8266WM_MRD_ ``` Starting ESP8266WM_MRD_ForcedConfig using LittleFS with SSL on ESP8266_NODEMCU -Blynk_WM SSL for ESP8266 v1.4.0 +Blynk_WM SSL for ESP8266 v1.5.0 ESP_MultiResetDetector v1.1.1 [267] Set CustomsStyle to : [289] Set CustomsHeadElement to : @@ -2553,7 +2577,7 @@ The following is the sample terminal output when running example [ESP32WM_MRD_Co ``` Starting ESP32WM_MRD_Config using LITTLEFS with SSL on ESP32S2_DEV -Blynk_WM SSL for ESP32 v1.4.0 +Blynk_WM SSL for ESP32 v1.5.0 ESP_MultiResetDetector v1.1.1 [134394] Set CustomsStyle to : [134417] Set CustomsHeadElement to : @@ -2634,8 +2658,6 @@ Pubs Topics = default-mqtt-PubTopic --- ---- - ### 9. ESP32WM_MRD_ForcedConfig using LITTLEFS with SSL on ESP32_DEV to demo WiFi Scan The following is the sample terminal output when running example [ESP32WM_MRD_ForcedConfig](examples/ESP32WM_MRD_ForcedConfig) on **ESP32_DEV** with WiFi Scan for selection in Configuration Portal. @@ -2644,7 +2666,7 @@ The following is the sample terminal output when running example [ESP32WM_MRD_Fo ``` Starting ESP32WM_MRD_ForcedConfig using LITTLEFS with SSL on ESP32_DEV -Blynk_WM SSL for ESP32 v1.4.0 +Blynk_WM SSL for ESP32 v1.5.0 ESP_MultiResetDetector v1.1.1 [228] Set CustomsStyle to : [250] Set CustomsHeadElement to : @@ -2767,7 +2789,7 @@ Pubs Topics = default-mqtt-PubTopic ``` Starting ESP32WM_MRD_ForcedConfig using LITTLEFS with SSL on ESP32_DEV -Blynk_WM SSL for ESP32 v1.4.0 +Blynk_WM SSL for ESP32 v1.5.0 ESP_MultiResetDetector v1.1.1 [227] Set CustomsStyle to : [249] Set CustomsHeadElement to : @@ -2885,6 +2907,11 @@ Sometimes, the library will only work if you update the board core to the latest ## Releases +### Releases v1.5.0 + +1. Fix bug. +2. Optimize and sync with [**Blynk_Async_WM library v1.5.0**](https://github.com/khoih-prog/Blynk_Async_WM) + ### Major Release v1.4.0 1. 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). Now you can select optional **SCAN_WIFI_NETWORKS**, **MANUAL_SSID_INPUT_ALLOWED** to be able to manually input SSID, not only from a scanned SSID lists and **MAX_SSID_IN_LIST** (from 2-15) @@ -3094,9 +3121,9 @@ Submit issues to: [Blynk_WM issues](https://github.com/khoih-prog/Blynk_WM/issue 28. Configurable **Customs HTML Headers**, including Customs Style, Customs Head Elements, CORS Header 29. Add support to **ESP32-C3 using EEPROM and SPIFFS** 30. Fix SSL issue with Blynk Cloud Server by using SSL in unsecured mode. -30. Permit optionally inputting one set of WiFi SSID/PWD by using `REQUIRE_ONE_SET_SSID_PW == true` -31. Enforce WiFi PWD minimum length of 8 chars -32. Enable **scan of WiFi networks** for selection in Configuration Portal +31. Permit optionally inputting one set of WiFi SSID/PWD by using `REQUIRE_ONE_SET_SSID_PW == true` +32. Enforce WiFi PWD minimum length of 8 chars +33. Enable **scan of WiFi networks** for selection in Configuration Portal --- --- diff --git a/examples/AM2315_ESP32_SSL/AM2315_ESP32_SSL.ino b/examples/AM2315_ESP32_SSL/AM2315_ESP32_SSL.ino index b48fe3f..c96c4db 100644 --- a/examples/AM2315_ESP32_SSL/AM2315_ESP32_SSL.ino +++ b/examples/AM2315_ESP32_SSL/AM2315_ESP32_SSL.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/AM2315_ESP32_SSL/defines.h b/examples/AM2315_ESP32_SSL/defines.h index abe62af..b00ba91 100644 --- a/examples/AM2315_ESP32_SSL/defines.h +++ b/examples/AM2315_ESP32_SSL/defines.h @@ -97,6 +97,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/AM2315_ESP8266/AM2315_ESP8266.ino b/examples/AM2315_ESP8266/AM2315_ESP8266.ino index d75e82b..2277a75 100644 --- a/examples/AM2315_ESP8266/AM2315_ESP8266.ino +++ b/examples/AM2315_ESP8266/AM2315_ESP8266.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/AM2315_ESP8266/defines.h b/examples/AM2315_ESP8266/defines.h index bf8e42d..22921e6 100644 --- a/examples/AM2315_ESP8266/defines.h +++ b/examples/AM2315_ESP8266/defines.h @@ -82,6 +82,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/Blynk_WM_Template/Blynk_WM_Template.ino b/examples/Blynk_WM_Template/Blynk_WM_Template.ino index 88a3253..446e4d2 100644 --- a/examples/Blynk_WM_Template/Blynk_WM_Template.ino +++ b/examples/Blynk_WM_Template/Blynk_WM_Template.ino @@ -8,7 +8,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -38,6 +38,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ // Sketch uses Arduino IDE-selected ESP32 and ESP8266 to select compile choices @@ -157,6 +158,8 @@ //#define USE_DYNAMIC_PARAMETERS false ///////////////////////////////////////////// + + #define REQUIRE_ONE_SET_SSID_PW false #define SCAN_WIFI_NETWORKS true diff --git a/examples/DHT11ESP32/DHT11ESP32.ino b/examples/DHT11ESP32/DHT11ESP32.ino index abc32ad..2696eed 100644 --- a/examples/DHT11ESP32/DHT11ESP32.ino +++ b/examples/DHT11ESP32/DHT11ESP32.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/DHT11ESP32/defines.h b/examples/DHT11ESP32/defines.h index fe94b22..bdeb987 100644 --- a/examples/DHT11ESP32/defines.h +++ b/examples/DHT11ESP32/defines.h @@ -95,6 +95,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/DHT11ESP32_SSL/DHT11ESP32_SSL.ino b/examples/DHT11ESP32_SSL/DHT11ESP32_SSL.ino index 6a590da..19c950b 100644 --- a/examples/DHT11ESP32_SSL/DHT11ESP32_SSL.ino +++ b/examples/DHT11ESP32_SSL/DHT11ESP32_SSL.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/DHT11ESP32_SSL/defines.h b/examples/DHT11ESP32_SSL/defines.h index 47ac237..201aea5 100644 --- a/examples/DHT11ESP32_SSL/defines.h +++ b/examples/DHT11ESP32_SSL/defines.h @@ -95,6 +95,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/DHT11ESP8266/DHT11ESP8266.ino b/examples/DHT11ESP8266/DHT11ESP8266.ino index 6a80d98..4415e4a 100644 --- a/examples/DHT11ESP8266/DHT11ESP8266.ino +++ b/examples/DHT11ESP8266/DHT11ESP8266.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/DHT11ESP8266/defines.h b/examples/DHT11ESP8266/defines.h index b21867a..84d1458 100644 --- a/examples/DHT11ESP8266/defines.h +++ b/examples/DHT11ESP8266/defines.h @@ -83,6 +83,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/DHT11ESP8266_Debug/DHT11ESP8266_Debug.ino b/examples/DHT11ESP8266_Debug/DHT11ESP8266_Debug.ino index 28359f5..cebee8b 100644 --- a/examples/DHT11ESP8266_Debug/DHT11ESP8266_Debug.ino +++ b/examples/DHT11ESP8266_Debug/DHT11ESP8266_Debug.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/DHT11ESP8266_Debug/defines.h b/examples/DHT11ESP8266_Debug/defines.h index f146280..085875d 100644 --- a/examples/DHT11ESP8266_Debug/defines.h +++ b/examples/DHT11ESP8266_Debug/defines.h @@ -83,6 +83,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/DHT11ESP8266_SSL/DHT11ESP8266_SSL.ino b/examples/DHT11ESP8266_SSL/DHT11ESP8266_SSL.ino index 4f69c6c..14e6798 100644 --- a/examples/DHT11ESP8266_SSL/DHT11ESP8266_SSL.ino +++ b/examples/DHT11ESP8266_SSL/DHT11ESP8266_SSL.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/DHT11ESP8266_SSL/defines.h b/examples/DHT11ESP8266_SSL/defines.h index 735df75..ed5bc69 100644 --- a/examples/DHT11ESP8266_SSL/defines.h +++ b/examples/DHT11ESP8266_SSL/defines.h @@ -81,6 +81,8 @@ ///////////////////////////////////////////// + #define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP32WM_Config/ESP32WM_Config.ino b/examples/ESP32WM_Config/ESP32WM_Config.ino index 53f631f..443f2c9 100644 --- a/examples/ESP32WM_Config/ESP32WM_Config.ino +++ b/examples/ESP32WM_Config/ESP32WM_Config.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP32WM_Config/defines.h b/examples/ESP32WM_Config/defines.h index efb3363..041c8a9 100644 --- a/examples/ESP32WM_Config/defines.h +++ b/examples/ESP32WM_Config/defines.h @@ -85,6 +85,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP32WM_ForcedConfig/ESP32WM_ForcedConfig.ino b/examples/ESP32WM_ForcedConfig/ESP32WM_ForcedConfig.ino index 600667c..a03e18a 100644 --- a/examples/ESP32WM_ForcedConfig/ESP32WM_ForcedConfig.ino +++ b/examples/ESP32WM_ForcedConfig/ESP32WM_ForcedConfig.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP32WM_ForcedConfig/defines.h b/examples/ESP32WM_ForcedConfig/defines.h index 0927223..2833183 100644 --- a/examples/ESP32WM_ForcedConfig/defines.h +++ b/examples/ESP32WM_ForcedConfig/defines.h @@ -87,6 +87,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP32WM_MRD_Config/ESP32WM_MRD_Config.ino b/examples/ESP32WM_MRD_Config/ESP32WM_MRD_Config.ino index 809660f..2f63455 100644 --- a/examples/ESP32WM_MRD_Config/ESP32WM_MRD_Config.ino +++ b/examples/ESP32WM_MRD_Config/ESP32WM_MRD_Config.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP32WM_MRD_Config/defines.h b/examples/ESP32WM_MRD_Config/defines.h index 1ab5b6b..ce2c7a2 100644 --- a/examples/ESP32WM_MRD_Config/defines.h +++ b/examples/ESP32WM_MRD_Config/defines.h @@ -120,6 +120,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP32WM_MRD_ForcedConfig/ESP32WM_MRD_ForcedConfig.ino b/examples/ESP32WM_MRD_ForcedConfig/ESP32WM_MRD_ForcedConfig.ino index 55cef9b..6bd5c16 100644 --- a/examples/ESP32WM_MRD_ForcedConfig/ESP32WM_MRD_ForcedConfig.ino +++ b/examples/ESP32WM_MRD_ForcedConfig/ESP32WM_MRD_ForcedConfig.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP32WM_MRD_ForcedConfig/defines.h b/examples/ESP32WM_MRD_ForcedConfig/defines.h index 74b9663..48033e7 100644 --- a/examples/ESP32WM_MRD_ForcedConfig/defines.h +++ b/examples/ESP32WM_MRD_ForcedConfig/defines.h @@ -87,7 +87,7 @@ #define USE_LITTLEFS false #define USE_SPIFFS true #else - #define USE_LITTLEFS true + #define USE_LITTLEFS false #define USE_SPIFFS false #endif @@ -120,6 +120,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP8266WM_Config/ESP8266WM_Config.ino b/examples/ESP8266WM_Config/ESP8266WM_Config.ino index 9db2364..6a02662 100644 --- a/examples/ESP8266WM_Config/ESP8266WM_Config.ino +++ b/examples/ESP8266WM_Config/ESP8266WM_Config.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP8266WM_Config/defines.h b/examples/ESP8266WM_Config/defines.h index 7a5b309..e080b20 100644 --- a/examples/ESP8266WM_Config/defines.h +++ b/examples/ESP8266WM_Config/defines.h @@ -72,6 +72,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP8266WM_ForcedConfig/ESP8266WM_ForcedConfig.ino b/examples/ESP8266WM_ForcedConfig/ESP8266WM_ForcedConfig.ino index aefca12..c435292 100644 --- a/examples/ESP8266WM_ForcedConfig/ESP8266WM_ForcedConfig.ino +++ b/examples/ESP8266WM_ForcedConfig/ESP8266WM_ForcedConfig.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 *****************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP8266WM_ForcedConfig/defines.h b/examples/ESP8266WM_ForcedConfig/defines.h index 860e53a..c3f5bac 100644 --- a/examples/ESP8266WM_ForcedConfig/defines.h +++ b/examples/ESP8266WM_ForcedConfig/defines.h @@ -72,6 +72,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP8266WM_MRD_Config/ESP8266WM_MRD_Config.ino b/examples/ESP8266WM_MRD_Config/ESP8266WM_MRD_Config.ino index 5b593a1..186fe4d 100644 --- a/examples/ESP8266WM_MRD_Config/ESP8266WM_MRD_Config.ino +++ b/examples/ESP8266WM_MRD_Config/ESP8266WM_MRD_Config.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 ********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP8266WM_MRD_Config/defines.h b/examples/ESP8266WM_MRD_Config/defines.h index c0f12cc..816b26b 100644 --- a/examples/ESP8266WM_MRD_Config/defines.h +++ b/examples/ESP8266WM_MRD_Config/defines.h @@ -104,6 +104,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/examples/ESP8266WM_MRD_ForcedConfig/ESP8266WM_MRD_ForcedConfig.ino b/examples/ESP8266WM_MRD_ForcedConfig/ESP8266WM_MRD_ForcedConfig.ino index d6b81e5..84c492b 100644 --- a/examples/ESP8266WM_MRD_ForcedConfig/ESP8266WM_MRD_ForcedConfig.ino +++ b/examples/ESP8266WM_MRD_ForcedConfig/ESP8266WM_MRD_ForcedConfig.ino @@ -7,7 +7,7 @@ Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases Built by Khoi Hoang https://github.com/khoih-prog/Blynk_WM Licensed under MIT license - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -37,6 +37,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 ********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/ESP8266WM_MRD_ForcedConfig/defines.h b/examples/ESP8266WM_MRD_ForcedConfig/defines.h index 811e7bd..42e0bad 100644 --- a/examples/ESP8266WM_MRD_ForcedConfig/defines.h +++ b/examples/ESP8266WM_MRD_ForcedConfig/defines.h @@ -104,6 +104,8 @@ ///////////////////////////////////////////// +#define REQUIRE_ONE_SET_SSID_PW false + #define SCAN_WIFI_NETWORKS true // To be able to manually input SSID, not from a scanned SSID lists diff --git a/library.json b/library.json index 86650ba..7fbca99 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Blynk_WM", - "version": "1.4.0", + "version": "1.5.0", "description": "Library for configuring/auto(re)connecting ESP32 (including ESP32-S2, ESP32-C3), ESP8266 modules to best or available MultiWiFi APs and MultiBlynk servers at runtime. Enable adding dynamic custom parameters from sketch and input using the same Config Portal (CP). CP will be auto-adjusted to match the number of dynamic parameters. Optional default Credentials to be autoloaded into CP to use or change instead of manually input. Static STA IP and DHCP Hostname as well as Config Portal AP channel, IP, SSID, Password can be configured. Config. Data saved in ESP8266/ESP32 LittleFS, SPIFFS or EEPROM. Multi, Double DetectDetector or Virtual CP Switch feature permits entering CP as requested. Configurable Customs HTML Headers, including Customs Style, Customs Head Elements, CORS Header. Now with scanning of WiFi networks for selection in Configuration Portal.", "keywords": "control, device, communication, blynk, iot, wifi, esp8266, esp32, esp32-s2, esp32-c3, drd, mrd, double-reset, multi-reset, config-portal, credentials, dynamic-params, customs-header, smartphone, mobile, app, web, cloud, sensors, m2m, protocol, ble, bluetooth, Manager, DynamicParameters, dynamic, configportal, usb, serial, ethernet, data, http, portal ", "authors": diff --git a/library.properties b/library.properties index 5788f82..f75164d 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Blynk_WiFiManager -version=1.4.0 +version=1.5.0 author=Khoi Hoang license=MIT maintainer=Khoi Hoang diff --git a/src/BlynkSimpleEsp32_SSL_WM.h b/src/BlynkSimpleEsp32_SSL_WM.h index fe76caf..e436e48 100644 --- a/src/BlynkSimpleEsp32_SSL_WM.h +++ b/src/BlynkSimpleEsp32_SSL_WM.h @@ -16,7 +16,7 @@ @date Jan 2015 @brief - Version: 1.4.0 + Version: 1.5.0 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -46,6 +46,7 @@ Fix SSL issue with Blynk Cloud Server 1.3.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32 1.4.0 K Hoang 24/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.5.0 K Hoang 25/04/2021 Fix bug. Optimize and sync with Blynk_Async_WM library v1.5.0 ********************************************************************************************************************************/ #ifndef BlynkSimpleEsp32_SSL_WM_h @@ -55,7 +56,7 @@ #error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting. #endif -#define BLYNK_WM_VERSION "Blynk_WM SSL for ESP32 v1.4.0" +#define BLYNK_WM_VERSION "Blynk_WM SSL for ESP32 v1.5.0" #if defined(BLYNK_SSL_USE_LETSENCRYPT) static const char BLYNK_DEFAULT_ROOT_CA[] = @@ -85,8 +86,7 @@ // Use LittleFS #include "FS.h" - // The library will be depreciated after being merged to future major Arduino esp32 core release 2.x - // At that time, just remove this library inclusion + // The library has been merged into Arduino esp32 core release v1.0.6 #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; @@ -380,17 +380,17 @@ const char BLYNK_WM_HTML_HEAD_START[] /*PROGMEM*/ = " const char BLYNK_WM_HTML_HEAD_STYLE[] /*PROGMEM*/ = ""; -const char BLYNK_WM_HTML_HEAD_END[] /*PROGMEM*/ = "
\ +const char BLYNK_WM_HTML_HEAD_END[] /*PROGMEM*/ = "
\
[[input_id]]
\ -
\ +
\
[[input_id1]]
\ -
\ -
\ -
\ -
\ -
\ -
\ -
"; // DO NOT CHANGE THIS STRING EVER!!!! +
\ +
\ +
\ +
\ +
\ +
\ +
"; // DO NOT CHANGE THIS STRING EVER!!!! const char BLYNK_WM_HTML_INPUT_ID[] /*PROGMEM*/ = ""; const char BLYNK_WM_HTML_INPUT_ID1[] /*PROGMEM*/ = ""; @@ -398,8 +398,8 @@ const char BLYNK_WM_HTML_INPUT_ID1[] /*PROGMEM*/ = "
"; -const char BLYNK_WM_HTML_BUTTON[] /*PROGMEM*/ = "
"; -const char BLYNK_WM_HTML_SCRIPT[] /*PROGMEM*/ = "