v1.6.0 to autodetect ESP32 core version

### Release v1.6.0

1. Auto detect ESP32 core and use either built-in LittleFS or LITTLEFS library. 
2. Fix bug returning IP `255.255.255.255` in core v2.0.0+ when using `hostname`

Author: khoih-prog

CONTRIBUTING.md

@@ -15,7 +15,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
 Please ensure to specify the following:
 
 * Arduino IDE version (e.g. 1.8.16) or Platform.io version
-* `ESP8266` or `ESP32` Core Version (e.g. ESP8266 core v3.0.2 or ESP32 v2.0.0)
+* `ESP8266` or `ESP32` Core Version (e.g. ESP8266 core v3.0.2 or ESP32 v2.0.1)
 * Contextual information (e.g. what you were trying to achieve)
 * Simplest possible steps to reproduce
 * Anything that might be relevant in your opinion, such as:
@@ -29,7 +29,7 @@ Please ensure to specify the following:
 Arduino IDE version: 1.8.16
 ESP8266 Core Version 3.0.2
 OS: Ubuntu 20.04 LTS
-Linux Inspiron 5.4.0-86-generic #97-Ubuntu SMP Fri Sep 17 19:19:40 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
+Linux Inspiron 5.4.0-90-generic #101-Ubuntu SMP Fri Oct 15 20:00:55 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
 
 Context:
 The board couldn't autoreconnect to Local Blynk Server after router power recycling.

README.md

@@ -139,11 +139,11 @@ This [**ESP_WiFiManager_Lite** library](https://github.com/khoih-prog/ESP_WiFiMa
 ## Prerequisites
 
  1. [`Arduino IDE 1.8.16+` for Arduino](https://www.arduino.cc/en/Main/Software)
- 2. [`ESP32 Core 2.0.0+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards. [![Latest release](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
+ 2. [`ESP32 Core 2.0.1+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards. [![Latest release](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
  3. [`ESP8266 Core 3.0.2+`](https://github.com/esp8266/Arduino) for ESP8266-based boards. [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/). SPIFFS is deprecated from ESP8266 core 2.7.1+, to use LittleFS. 
- 4. [`ESP_DoubleResetDetector v1.1.2+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector).
- 5. [`ESP_MultiResetDetector v1.1.2+`](https://github.com/khoih-prog/ESP_MultiResetDetector) if using MRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_MultiResetDetector.svg?)](https://www.ardu-badge.com/ESP_MultiResetDetector).
- 6. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [esp32 core v1.0.6](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS).
+ 4. [`ESP_DoubleResetDetector v1.2.1+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector).
+ 5. [`ESP_MultiResetDetector v1.2.1+`](https://github.com/khoih-prog/ESP_MultiResetDetector) if using MRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_MultiResetDetector.svg?)](https://www.ardu-badge.com/ESP_MultiResetDetector).
+ 6. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS with ESP32 core v1.0.4-. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [ESP32 core v1.0.6+](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS) and you don't need to install it if using ESP32 core v1.0.6+
 
 ---
 
@@ -1171,8 +1171,8 @@ This is the terminal output when running [**ESP_WiFi**](examples/ESP_WiFi) examp
 
 ```
 Starting ESP_WiFi using LittleFS on ESP32_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFC0003
 multiResetDetectorFlag = 0xFFFC0003
 lowerBytes = 0x0003, upperBytes = 0x0003
@@ -1242,8 +1242,8 @@ FFFFFFFFF
 
 ```
 Starting ESP_WiFi using LittleFS on ESP32_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1314,8 +1314,8 @@ This is the terminal output when running [**ESP_WiFi_MQTT**](examples/ESP_WiFi_M
 
 ```
 Starting ESP_WiFi_MQTT using LittleFS on ESP8266_NODEMCU
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1389,8 +1389,8 @@ NNN
 
 
 Starting ESP_WiFi_MQTT using LittleFS on ESP8266_NODEMCU
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1481,8 +1481,8 @@ This is the terminal output when running [**ESP_WiFi_MQTT**](examples/ESP_WiFi_M
 
 ```
 Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1594,8 +1594,8 @@ entry 0x4004c190
 
 
 Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1696,8 +1696,8 @@ This is the terminal output when running [**ESP_WiFi_MQTT**](examples/ESP_WiFi_M
 
 ```
 Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFC0003
 multiResetDetectorFlag = 0xFFFC0003
 lowerBytes = 0x0003, upperBytes = 0x0003
@@ -1724,8 +1724,8 @@ NNNN NNNNN NNNNN NNNNN NN[WML] h:UpdLittleFS
 
 ```
 Starting ESP_WiFi_MQTT using LittleFS on ESP32S2_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1780,8 +1780,8 @@ This is the terminal output when running [**ESP_WiFi**](examples/ESP_WiFi) examp
 
 ```
 Starting ESP_WiFi_MQTT using LittleFS on ESP32_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFC0003
 multiResetDetectorFlag = 0xFFFC0003
 lowerBytes = 0x0003, upperBytes = 0x0003
@@ -1824,8 +1824,8 @@ N
 
 ```
 Starting ESP_WiFi_MQTT using LittleFS on ESP32_DEV
-ESP_WiFiManager_Lite v1.5.1
-ESP_MultiResetDetector v1.1.2
+ESP_WiFiManager_Lite v1.6.0
+ESP_MultiResetDetector v1.2.1
 LittleFS Flag read = 0xFFFE0001
 multiResetDetectorFlag = 0xFFFE0001
 lowerBytes = 0x0001, upperBytes = 0x0001
@@ -1934,6 +1934,7 @@ Submit issues to: [ESP_WiFiManager_Lite issues](https://github.com/khoih-prog/ES
 22. Configurable **Customs HTML Headers**, including Customs Style, Customs Head Elements, CORS Header
 23. Add support to **ESP32-C3 using EEPROM and SPIFFS**
 24. Enable **scan of WiFi networks** for selection in Configuration Portal
+25. Ready for ESP32 core v2.0.0+
 
 ---
 ---

changelog.md

@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Release v1.6.0](#release-v160)
   * [Release v1.5.1](#release-v151)
   * [Major Release v1.5.0](#major-release-v150)
   * [Release v1.4.0](#release-v140)
@@ -25,6 +26,12 @@
 
 ## Changelog
 
+### Release v1.6.0
+
+1. Auto detect ESP32 core and use either built-in LittleFS or LITTLEFS library. 
+2. Fix bug returning IP `255.255.255.255` in core v2.0.0+ when using `hostname`
+
+
 ### Release v1.5.1
 
 1. Update `platform.ini` and `library.json` to use original `khoih-prog` instead of `khoih.prog` after PIO fix

library.json

@@ -1,6 +1,6 @@
 {
   "name": "ESP_WiFiManager_Lite",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "keywords": "wifi, wi-fi, MultiWiFi, multi-wifi, WiFiManager, esp8266, esp32, esp32-s2, esp32-c3, Communication, iot, credentials, persistent, config-portal, DoubleReset, MultiReset, DoubleResetDetector, littlefs, spiffs, eeprom, light-weight",
   "description": "Library to configure MultiWiFi/Credentials at runtime for ESP32 (including ESP32-S2 and ESP32-C3) and ESP8266 boards. You can also specify DHCP HostName, static AP and STA IP. Use much less memory compared to full-fledge WiFiManager. Config Portal will be auto-adjusted to match the number of dynamic custom parameters. Optional default Credentials to be autoloaded into Config Portal to use or change instead of manually input. Credentials are saved in LittleFS, SPIFFS or EEPROM. New powerful-yet-simple-to-use feature to enable adding dynamic custom parameters from sketch and input using the same Config Portal. Double or MultiDetectDetector as well as Virtual Switches feature permits entering Config Portal as requested. Configurable Customs HTML Headers, including Customs Style, Customs Head Elements, CORS Header.",
   "authors":
@@ -27,13 +27,13 @@
     {
       "owner": "khoih-prog",
       "name": "ESP_DoubleResetDetector",
-      "version": "^1.1.2",
+      "version": "^1.2.1",
       "platforms": ["espressif8266", "espressif32"]
     },
     {
       "owner": "khoih-prog",
       "name": "ESP_MultiResetDetector",
-      "version": "^1.1.2",
+      "version": "^1.2.1",
       "platforms": ["espressif8266", "espressif32"]
     },
     {
@@ -45,5 +45,6 @@
   ],
   "frameworks": "*",
   "platforms": ["espressif8266", "espressif32"],
-  "examples": "examples/*/*/*.ino"
+  "examples": "examples/*/*/*.ino",
+  "headers": "ESP_WiFiManager_Lite.h"
 }

library.properties

@@ -1,5 +1,5 @@
 name=ESP_WiFiManager_Lite
-version=1.5.1
+version=1.6.0
 author=Khoi Hoang
 maintainer=Khoi Hoang <[email protected]>
 license=MIT

platformio/platformio.ini

@@ -32,13 +32,13 @@ lib_compat_mode = strict
 
 lib_deps =
 ; PlatformIO 4.x
-  ESP_DoubleResetDetector@>=1.1.2
-  ESP_MultiResetDetector@>=1.1.2
-  LittleFS_esp32@>=1.0.6
+;  ESP_DoubleResetDetector@>=1.2.1
+;  ESP_MultiResetDetector@>=1.2.1
+;  LittleFS_esp32@>=1.0.6
 ; PlatformIO 5.x 
-; khoih-prog/ESP_DoubleResetDetector@>=1.1.2
-; khoih-prog/ESP_MultiResetDetector@>=1.1.2
-; lorol/LittleFS_esp32@>=1.0.6
+ khoih-prog/ESP_DoubleResetDetector@>=1.2.1
+ khoih-prog/ESP_MultiResetDetector@>=1.2.1
+ lorol/LittleFS_esp32@>=1.0.6
 
 
 build_flags =

src/ESP_WiFiManager_Lite.h

@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager_Lite
   Licensed under MIT license
   
-  Version: 1.5.1
+  Version: 1.6.0
    
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.4.0   K Hoang      21/04/2021  Add support to new ESP32-C3 using SPIFFS or EEPROM
   1.5.0   Michael H    24/04/2021  Enable scan of WiFi networks for selection in Configuration Portal
   1.5.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
+  1.6.0   K Hoang      26/11/2021  Auto detect ESP32 core and use either built-in LittleFS or LITTLEFS library. Fix bug.
  *****************************************************************************************************************************/
 
 #pragma once
@@ -39,7 +40,7 @@
   #define USING_ESP32_C3        true
 #endif
 
-#define ESP_WIFI_MANAGER_LITE_VERSION        "ESP_WiFiManager_Lite v1.5.1"
+#define ESP_WIFI_MANAGER_LITE_VERSION        "ESP_WiFiManager_Lite v1.6.0"
 
 #ifdef ESP8266
 
@@ -96,14 +97,26 @@
     // 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
-    #include <LITTLEFS.h>             // https://github.com/lorol/LITTLEFS
+    // Check cores/esp32/esp_arduino_version.h and cores/esp32/core_version.h
+    //#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) )  //(ESP_ARDUINO_VERSION_MAJOR >= 2)
+    #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
+      #warning Using ESP32 Core 1.0.6 or 2.0.0+ and LittleFS in ESP_WiFiManager_Lite.h
+      // The library has been merged into esp32 core from release 1.0.6
+      #include <LittleFS.h>
+      
+      FS* filesystem =      &LittleFS;
+      #define FileFS        LittleFS
+      #define FS_Name       "LittleFS"
+    #else
+      #warning Using ESP32 Core 1.0.5- and LittleFS in ESP_WiFiManager_Lite.h. You must install LITTLEFS library
+      // The library has been merged into esp32 core from release 1.0.6
+      #include <LITTLEFS.h>             // https://github.com/lorol/LITTLEFS
+      
+      FS* filesystem =      &LITTLEFS;
+      #define FileFS        LITTLEFS
+      #define FS_Name       "LittleFS"
+    #endif
 
-    FS* filesystem =        &LITTLEFS;
-    #define FileFS          LITTLEFS
-    #define FS_Name         "LittleFS"
-    #warning Using LittleFS in ESP_WiFiManager_Lite.h
   #elif USE_SPIFFS
     #include "FS.h"
     #include <SPIFFS.h>
@@ -563,6 +576,7 @@ class ESP_WiFiManager_Lite
         {          
           if ( strlen(ESP_WM_LITE_config.WiFi_Creds[i].wifi_pw) >= PASSWORD_MIN_LEN )
           {
+            ESP_WML_LOGDEBUG5(F("bg: addAP : index="), i, F(", SSID="), ESP_WM_LITE_config.WiFi_Creds[i].wifi_ssid, F(", PWD="), ESP_WM_LITE_config.WiFi_Creds[i].wifi_pw);
             wifiMulti.addAP(ESP_WM_LITE_config.WiFi_Creds[i].wifi_ssid, ESP_WM_LITE_config.WiFi_Creds[i].wifi_pw);
           }
           else
@@ -740,13 +754,20 @@ class ESP_WiFiManager_Lite
         WiFi.hostname(RFC952_hostname);
 #else
 
-      // Still have bug in ESP32_S2. If using WiFi.setHostname() => WiFi.localIP() always = 255.255.255.255
+
+  // Check cores/esp32/esp_arduino_version.h and cores/esp32/core_version.h
+  //#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) )  //(ESP_ARDUINO_VERSION_MAJOR >= 2)
+  #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
+      WiFi.setHostname(RFC952_hostname);
+  #else     
+      // Still have bug in ESP32_S2 for old core. If using WiFi.setHostname() => WiFi.localIP() always = 255.255.255.255
       if ( String(ARDUINO_BOARD) != "ESP32S2_DEV" )
       {
         // See https://github.com/espressif/arduino-esp32/issues/2537
         WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
         WiFi.setHostname(RFC952_hostname);
       } 
+   #endif
 #endif        
       }
     }
@@ -1132,7 +1153,7 @@ class ESP_WiFiManager_Lite
     void displayWiFiData()
     {
       ESP_WML_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
-      ESP_WML_LOGERROR1(F("IP="), localIP() );
+      ESP_WML_LOGERROR1(F("IP="), WiFi.localIP() );
     }
 
     //////////////////////////////////////
@@ -2192,11 +2213,24 @@ class ESP_WiFiManager_Lite
 #endif
 
     //////////////////////////////////////////////
-
+    
     uint8_t connectMultiWiFi()
     {
-      // For ESP8266, this better be 3000 to enable connect the 1st time
-#define WIFI_MULTI_CONNECT_WAITING_MS      3000L
+#if ESP32
+  // For ESP32, this better be 0 to shorten the connect time.
+  // For ESP32-S2/C3, must be > 500
+  #if ( USING_ESP32_S2 || USING_ESP32_C3 )
+    #define WIFI_MULTI_1ST_CONNECT_WAITING_MS           500L
+  #else
+    // For ESP32 core v1.0.6, must be >= 500
+    #define WIFI_MULTI_1ST_CONNECT_WAITING_MS           800L
+  #endif
+#else
+  // For ESP8266, this better be 2200 to enable connect the 1st time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS             2200L
+#endif
+
+#define WIFI_MULTI_CONNECT_WAITING_MS                   500L
 
       uint8_t status;
 
@@ -2208,11 +2242,12 @@ class ESP_WiFiManager_Lite
 
       int i = 0;
       status = wifiMulti.run();
-      delay(WIFI_MULTI_CONNECT_WAITING_MS);
+      delay(WIFI_MULTI_1ST_CONNECT_WAITING_MS);
 
-      while ( ( i++ < 10 ) && ( status != WL_CONNECTED ) )
+      while ( ( i++ < 20 ) && ( status != WL_CONNECTED ) )
       {
-        status = wifiMulti.run();
+        //status = wifiMulti.run();
+        status = WiFi.status();
 
         if ( status == WL_CONNECTED )
           break;
@@ -2227,8 +2262,24 @@ class ESP_WiFiManager_Lite
         ESP_WML_LOGWARN3(F("Channel="), WiFi.channel(), F(",IP="), WiFi.localIP() );
       }
       else
+      {
         ESP_WML_LOGERROR(F("WiFi not connected"));
 
+    #if USING_MRD
+        // To avoid unnecessary MRD
+        mrd->loop();
+    #else
+        // To avoid unnecessary DRD
+        drd->loop();
+    #endif
+      
+    #if ESP8266      
+        ESP.reset();
+    #else
+        ESP.restart();
+    #endif  
+      }
+
       return status;
     }