v1.2.1

### Releases v1.2.1 1. 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)
khoih-prog · Jan 31, 2021 · 6eadbb7 · 6eadbb7
1 parent e0b994e
commit 6eadbb7
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@
   * [Currently supported Boards](#currently-supported-boards)
   * [Currently supported Ethernet shields/modules](#currently-supported-ethernet-shieldsmodules)
 * [Changelog](#changelog)
+  * [Releases v1.2.1](#releases-v121)
   * [Major Releases v1.2.0](#major-releases-v120)
   * [Major Releases v1.1.0](#major-releases-v110)
   * [Releases v1.0.18](#releases-v1018)
@@ -186,6 +187,10 @@ This [**EthernetWebServer** library](https://github.com/khoih-prog/EthernetWebSe
 
 ## Changelog
 
+### Releases v1.2.1
+
+1. 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.2.0
 
 1. Fix Config Portal Bug. 
@@ -2102,7 +2107,7 @@ This is the terminal output of a ESP32 board with W5500 Ethernet shield running
 
 ```
 Start W5500_WM_Config using LittleFS on ESP32 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 LittleFS Flag read = 0xD0D04321
 No doubleResetDetected
 Saving config file...
@@ -2157,7 +2162,7 @@ B
 
 ```cpp
 Start W5500_WM_Config using LittleFS on ESP32 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 LittleFS Flag read = 0xD0D01234
 doubleResetDetected
 Saving config file...
@@ -2196,7 +2201,7 @@ CP Button Hit. Rebooting
 [38278] OK
 
 Start W5500_WM_Config using LittleFS on ESP32 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 LittleFS Flag read = 0xD0D04321
 No doubleResetDetected
 Saving config file...
@@ -2248,7 +2253,7 @@ Persistent CP Button Hit. Rebooting
 [9077] OK
 
 Start W5500_WM_Config using LittleFS on ESP32 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 LittleFS Flag read = 0xD0D01234
 doubleResetDetected
 Saving config file...
@@ -2295,7 +2300,7 @@ No Config Data with **LOAD_DEFAULT_CONFIG_DATA = false** => Config Portal don't
 
 ```
 Start W5500_WM_Config_SAMD on SEEED_XIAO_M0 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 [936] CCSum=0xb8f6,RCSum=0xffffffff
 [936] ChkCrR:CrCCsum=0xaf50,CrRCsum=0xffffffff
 [937] InitCfgFile,Sz=200
@@ -2326,7 +2331,7 @@ Input valid credentials with **LOAD_DEFAULT_CONFIG_DATA = false**. Click `Save`
 
 ```
 Start W5500_WM_Config_SAMD on SEEED_XIAO_M0 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 [1367] CCSum=0x2a5b,RCSum=0x2a5b
 [1368] ChkCrR:CrCCsum=0x15bd,CrRCsum=0x15bd
 [1368] CrCCSum=15bd,CrRCSum=15bd
@@ -2372,7 +2377,7 @@ BBBBBBBBB BBBBBBBBBB BBBBBBBBBB BBBBBBBBBB BBBBBBBBBB BBBBBBBBBB BBBBBBBBBB
 CP Button Hit. Rebooting
 
 Start W5500_WM_Config_SAMD on SEEED_XIAO_M0 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 [2128] CCSum=0x2a5b,RCSum=0x2a5b
 [2128] ChkCrR:CrCCsum=0x15bd,CrRCsum=0x15bd
 [2129] CrCCSum=15bd,CrRCSum=15bd
@@ -2405,7 +2410,7 @@ Pubs Topics = Pubs_Topics
 Persistent CP Button Hit. Rebooting
 
 Start W5500_WM_Config_SAMD on SEEED_XIAO_M0 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 [1427] CCSum=0x2a5b,RCSum=0x2a5b
 [1428] ChkCrR:CrCCsum=0x15bd,CrRCsum=0x15bd
 [1428] CrCCSum=15bd,CrRCSum=15bd
@@ -2440,7 +2445,7 @@ The following is the sample terminal output when running example [W5500_WM_Confi
 
 ```
 Start W5500_WM_Config_SAM_DUE on SAM DUE with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 [9] Simulate EEPROM,Sz=1024
 [9] CCSum=0x29f2,RCSum=0x29f2
 [10] ChkCrR:CrCCsum=0x1465,CrRCsum=0x1465
@@ -2488,7 +2493,7 @@ The following is the sample terminal output when running example [ENC28J60_Blynk
 
 ```
 Start ENC28J60_Blynk on NRF52840_FEATHER with ENC28J60 using UIPEthernet Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 LittleFS Flag read = 0xd0d04321
 Flag read = 0xd0d04321
 No doubleResetDetected
@@ -2579,7 +2584,7 @@ The following is the sample terminal output when running example [W5500_WM_Confi
 
 ```
 Start W5500_WM_Config_Teensy on TEENSY 4.1/4.0 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 Warning: W5x00 and ENC EthernetWebServer/Config-Portal only works with Teensy core v1.51
 [16480] CCSum=0x28d0,RCSum=0x28d0
 [16486] ChkCrR:CrCCSum=0x280b,CrRCSum=0x280b
@@ -2626,7 +2631,7 @@ The following is the sample terminal output when running example [W5500_WM_Confi
 
 ```
 Start W5500_WM_Config on ESP8266 with W5x00 using EthernetLarge Library
-BlynkEthernet_WM v1.2.0
+BlynkEthernet_WM v1.2.1
 EEPROM size = 2048, start = 0
 EEPROM Flag read = 0xD0D04321
 No doubleResetDetected
@@ -2712,6 +2717,10 @@ Sometimes, the library will only work if you update the board core to the latest
 
 ## Releases
 
+### Releases v1.2.1
+
+1. 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.2.0
 
 1. Fix Config Portal Bug. 

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "BlynkEthernet_Manager",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Simple Ethernet Manager for MultiBlynk for Teensy, SAM DUE, SAMD21, SAMD51, nRF52, ESP32, ESP8266, etc. boards, with or without SSL, configuration data saved in ESP8266/ESP32 LittleFS, SPIFFS, nRF52 LittleFS/InternalFS, EEPROM, DueFlashStorage or SAMD FlashStorage. Library for configuring/auto(re)connecting Ethernet W5100/W5200/W5500, ENC28J60 or NativeEthernet shields to Ethernet and MultiBlynk at runtime. New powerful-yet-simple-to-use feature to enable adding dynamic custom parameters from sketch and input using the same Config Portal. Config Portal will be auto-adjusted to match the number of dynamic parameters. DoubleDetectDetector is used to force Config Portal opening even if the Credentials are still valid. Build a smartphone app for your project in minutes. Blynk allows creating IoT solutions easily. It supports  WiFi, BLE, Bluetooth, Ethernet, GSM, USB, Serial. Works with many boards like ESP8266, ESP32, SAM DUE, SAMD21, SAMD51, nRF52, Teensy.",
   "keywords": "sensors, control, device, smartphone, mobile, app, web, cloud, communication, protocol, iot, m2m, wifi, ble, bluetooth, ethernet, usb, serial, gsm, gprs, 3g, data, esp32, esp8266, samd21, samd51, nrf52, stm32, nano-33-iot, sam-due, eeprom, littlefs, spiffs, flash-storage, flash-storage-samd, http, W5500, W5x00, ENC28J60, nativeethernet, native-ethernet",
   "authors":

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=BlynkEthernet_Manager
-version=1.2.0
+version=1.2.1
 author=Khoi Hoang
 license=MIT
 maintainer=Khoi Hoang <khoih.prog@gmail.com>

diff --git a/src/Adapters/BlynkEthernetENC.h b/src/Adapters/BlynkEthernetENC.h
@@ -17,7 +17,7 @@
   @date       Jan 2015
   @brief
 
-  Version: 1.2.0
+  Version: 1.2.1
 
   Version  Modified By   Date      Comments
   -------  -----------  ---------- -----------
@@ -39,6 +39,7 @@
   1.0.18    K Hoang      15/09/2020 Add support to new EthernetENC library for ENC28J60.
   1.1.0     K Hoang      13/01/2021 Add support to new NativeEthernet library for Teensy 4.1. Fix compiler warnings.
   1.2.0     K Hoang      29/01/2021 Fix bug. Add feature. Use more efficient FlashStorage_STM32 and FlashStorage_SAMD.
+  1.2.1     K Hoang      31/01/2021 To permit autoreset after timeout if DRD/MRD or non-persistent forced-CP
  *****************************************************************************************************************************/
 
 #ifndef BlynkEthernetENC_h

diff --git a/src/Adapters/BlynkEthernet_DUE_WM.h b/src/Adapters/BlynkEthernet_DUE_WM.h
@@ -17,7 +17,7 @@
   @date       Jan 2015
   @brief
 
-  Version: 1.2.0
+  Version: 1.2.1
 
   Version  Modified By   Date      Comments
   -------  -----------  ---------- -----------
@@ -39,6 +39,7 @@
   1.0.18    K Hoang      15/09/2020 Add support to new EthernetENC library for ENC28J60.
   1.1.0     K Hoang      13/01/2021 Add support to new NativeEthernet library for Teensy 4.1. Fix compiler warnings.
   1.2.0     K Hoang      29/01/2021 Fix bug. Add feature. Use more efficient FlashStorage_STM32 and FlashStorage_SAMD.
+  1.2.1     K Hoang      31/01/2021 To permit autoreset after timeout if DRD/MRD or non-persistent forced-CP
  *****************************************************************************************************************************/
 
 #ifndef BlynkEthernet_DUE_WM_h
@@ -446,8 +447,9 @@ class BlynkEthernet
           clearForcedCP();
         }
 
+        hadConfigData = isForcedConfigPortal ? true : (noConfigPortal ? false : true);
+
         // failed to connect to Blynk server, will start configuration mode
-        hadConfigData = false;
         startConfigurationMode();
       }
     }
@@ -1573,9 +1575,20 @@ uint16_t EEPROM_SIZE = (IFLASH1_PAGE_SIZE / sizeof(byte)) * 4;
       // If there is no saved config Data, stay in config mode forever until having config Data.
       // or SSID, PW, Server,Token ="nothing"
       if (hadConfigData)
+      {
         configTimeout = millis() + CONFIG_TIMEOUT;
+
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG4(BLYNK_F("s:millis() = "), millis(), BLYNK_F(", configTimeout = "), configTimeout);
+#endif
+      }
       else
+      {
         configTimeout = 0;
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG1(BLYNK_F("s:configTimeout = 0"));
+#endif        
+      }  
 
       configuration_mode = true;
     }

diff --git a/src/Adapters/BlynkEthernet_ESP32_WM.h b/src/Adapters/BlynkEthernet_ESP32_WM.h
@@ -17,7 +17,7 @@
   @date       Jan 2015
   @brief
 
-  Version: 1.2.0
+  Version: 1.2.1
 
   Version  Modified By   Date      Comments
   -------  -----------  ---------- -----------
@@ -39,6 +39,7 @@
   1.0.18    K Hoang      15/09/2020 Add support to new EthernetENC library for ENC28J60.
   1.1.0     K Hoang      13/01/2021 Add support to new NativeEthernet library for Teensy 4.1. Fix compiler warnings.
   1.2.0     K Hoang      29/01/2021 Fix bug. Add feature. Use more efficient FlashStorage_STM32 and FlashStorage_SAMD.
+  1.2.1     K Hoang      31/01/2021 To permit autoreset after timeout if DRD/MRD or non-persistent forced-CP
 *****************************************************************************************************************************/
 
 #ifndef BlynkEthernet_ESP32_WM_h
@@ -485,8 +486,9 @@ class BlynkEthernet
           clearForcedCP();
         }
 
+        hadConfigData = isForcedConfigPortal ? true : (noConfigPortal ? false : true);
+
         // failed to connect to Blynk server, will start configuration mode
-        hadConfigData = false;
         startConfigurationMode();
       }
     }
@@ -2163,9 +2165,20 @@ class BlynkEthernet
       // If there is no saved config Data, stay in config mode forever until having config Data.
       // or SSID, PW, Server,Token ="nothing"
       if (hadConfigData)
+      {
         configTimeout = millis() + CONFIG_TIMEOUT;
+
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG4(BLYNK_F("s:millis() = "), millis(), BLYNK_F(", configTimeout = "), configTimeout);
+#endif
+      }
       else
+      {
         configTimeout = 0;
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG1(BLYNK_F("s:configTimeout = 0"));
+#endif        
+      }  
 
       configuration_mode = true;
     }

diff --git a/src/Adapters/BlynkEthernet_ESP8266_WM.h b/src/Adapters/BlynkEthernet_ESP8266_WM.h
@@ -17,7 +17,7 @@
   @date       Jan 2015
   @brief
 
-  Version: 1.2.0
+  Version: 1.2.1
 
   Version  Modified By   Date      Comments
   -------  -----------  ---------- -----------
@@ -39,6 +39,7 @@
   1.0.18    K Hoang      15/09/2020 Add support to new EthernetENC library for ENC28J60.
   1.1.0     K Hoang      13/01/2021 Add support to new NativeEthernet library for Teensy 4.1. Fix compiler warnings.
   1.2.0     K Hoang      29/01/2021 Fix bug. Add feature. Use more efficient FlashStorage_STM32 and FlashStorage_SAMD.
+  1.2.1     K Hoang      31/01/2021 To permit autoreset after timeout if DRD/MRD or non-persistent forced-CP
 *****************************************************************************************************************************/
 
 #ifndef BlynkEthernet_WM_h
@@ -474,8 +475,9 @@ class BlynkEthernet
           clearForcedCP();
         }
 
+        hadConfigData = isForcedConfigPortal ? true : (noConfigPortal ? false : true);
+
         // failed to connect to Blynk server, will start configuration mode
-        hadConfigData = false;
         startConfigurationMode();
       }
     }
@@ -2155,9 +2157,20 @@ class BlynkEthernet
       // If there is no saved config Data, stay in config mode forever until having config Data.
       // or SSID, PW, Server,Token ="nothing"
       if (hadConfigData)
+      {
         configTimeout = millis() + CONFIG_TIMEOUT;
+
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG4(BLYNK_F("s:millis() = "), millis(), BLYNK_F(", configTimeout = "), configTimeout);
+#endif
+      }
       else
+      {
         configTimeout = 0;
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG1(BLYNK_F("s:configTimeout = 0"));
+#endif        
+      }  
 
       configuration_mode = true;
     }

diff --git a/src/Adapters/BlynkEthernet_NRF52_WM.h b/src/Adapters/BlynkEthernet_NRF52_WM.h
@@ -17,7 +17,7 @@
   @date       Jan 2015
   @brief
 
-  Version: 1.2.0
+  Version: 1.2.1
 
   Version  Modified By   Date      Comments
   -------  -----------  ---------- -----------
@@ -39,6 +39,7 @@
   1.0.18    K Hoang      15/09/2020 Add support to new EthernetENC library for ENC28J60.
   1.1.0     K Hoang      13/01/2021 Add support to new NativeEthernet library for Teensy 4.1. Fix compiler warnings.
   1.2.0     K Hoang      29/01/2021 Fix bug. Add feature. Use more efficient FlashStorage_STM32 and FlashStorage_SAMD.
+  1.2.1     K Hoang      31/01/2021 To permit autoreset after timeout if DRD/MRD or non-persistent forced-CP
 *****************************************************************************************************************************/
 
 #ifndef BlynkEthernet_NRF52_WM_h
@@ -455,8 +456,9 @@ class BlynkEthernet
           clearForcedCP();
         }
 
+        hadConfigData = isForcedConfigPortal ? true : (noConfigPortal ? false : true);
+
         // failed to connect to Blynk server, will start configuration mode
-        hadConfigData = false;
         startConfigurationMode();
       }
     }
@@ -1774,9 +1776,20 @@ class BlynkEthernet
       // If there is no saved config Data, stay in config mode forever until having config Data.
       // or SSID, PW, Server,Token ="nothing"
       if (hadConfigData)
+      {
         configTimeout = millis() + CONFIG_TIMEOUT;
+
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG4(BLYNK_F("s:millis() = "), millis(), BLYNK_F(", configTimeout = "), configTimeout);
+#endif
+      }
       else
+      {
         configTimeout = 0;
+#if ( BLYNK_WM_DEBUG > 2)                   
+        BLYNK_LOG1(BLYNK_F("s:configTimeout = 0"));
+#endif        
+      }  
 
       configuration_mode = true;
     }