v1.5.1 to update and add support

### Release v1.5.1 1. Update to be compatible with new `FlashStorage_SAMD` 2. Use better `FlashStorage_STM32` or `FlashStorage_STM32F1` library for STM32 3. Add support to generic SAMD21 boards : `__SAMD21E1xA__`, `__SAMD21G1xA__` and `__SAMD21J1xA__` 4. Update `Packages' Patches`
khoih-prog · Jan 27, 2022 · efb5131 · efb5131
1 parent d7d0154
commit efb5131
Show file tree

Hide file tree

Showing 16 changed files with 214 additions and 104 deletions.
diff --git a/CONTRIBUTING.md b/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.19) or Platform.io version
-* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, STM32 core v2.2.0, etc.)
+* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP8266 core v3.0.2, ArduinoCore-mbed v2.6.1, etc.)
 * 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:
@@ -27,9 +27,10 @@ Please ensure to specify the following:
 
 ```
 Arduino IDE version: 1.8.19
-Arduino STM32 Core v2.2.0
+Nano_RP2040_Connect board
+ArduinoCore-mbed v2.6.1
 OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.4.0-92-generic #103-Ubuntu SMP Fri Nov 26 16:13:00 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
+Linux xy-Inspiron-3593 5.4.0-96-generic #109-Ubuntu SMP Wed Jan 12 16:49:16 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
 
 Context:
 The board couldn't autoreconnect to Local Blynk Server after router power recycling.

diff --git a/README.md b/README.md
diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Release v1.5.1](#release-v151)
   * [Release v1.5.0](#release-v150)
   * [Release v1.4.1](#release-v141)
   * [Major Release v1.4.0](#major-release-v140)
@@ -28,6 +29,13 @@
 
 ## Changelog
 
+### Release v1.5.1
+
+1. Update to be compatible with new `FlashStorage_SAMD`
+2. Use better `FlashStorage_STM32` or `FlashStorage_STM32F1` library for STM32
+3. Add support to generic SAMD21 boards : `__SAMD21E1xA__`, `__SAMD21G1xA__` and `__SAMD21J1xA__`
+4. Update `Packages' Patches`
+
 ### Release v1.5.0
 
 1. Fix the blocking issue in loop(). Check [retries block the main loop #18](https://github.com/khoih-prog/WiFiManager_NINA_Lite/issues/18)

diff --git a/examples/SAMD_ESP8266Shield/defines.h b/examples/SAMD_ESP8266Shield/defines.h
@@ -28,11 +28,14 @@
 // Uncomment to use ESP32-AT commands
 //#define USE_ESP32_AT                  true
 
-#if    ( defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_MKRWIFI1010) \
-      || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRFox1200) || defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) \
-      || defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_SAMD_MKRVIDOR4000) || defined(__SAMD21G18A__) \
-      || defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(__SAMD21E18A__) || defined(__SAMD51__) || defined(__SAMD51J20A__) || defined(__SAMD51J19A__) \
-      || defined(__SAMD51G19A__) || defined(__SAMD21G18A__) )
+#if  ( defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_MKRWIFI1010) \
+    || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRFox1200) || defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) \
+    || defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_SAMD_MKRVIDOR4000) \
+    || defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(__SAMD51__) || defined(__SAMD51J20A__) \
+    || defined(__SAMD51J19A__) || defined(__SAMD51G19A__) || defined(__SAMD51P19A__)  \
+    || defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) \
+    || defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) \
+    || defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__) )
   #if defined(ESP8266_AT_USE_SAMD)
     #undef ESP8266_AT_USE_SAMD
   #endif

diff --git a/keywords.txt b/keywords.txt
@@ -39,6 +39,12 @@ IPAddressToString KEYWORD2
 
 #	LITERAL1
 
+ESP_AT_WM_LITE_VERSION  LITERAL1
+ESP_AT_WM_LITE_VERSION_MAJOR  LITERAL1
+ESP_AT_WM_LITE_VERSION_MINOR  LITERAL1
+ESP_AT_WM_LITE_VERSION_PATCH  LITERAL1
+ESP_AT_WM_LITE_VERSION_INT  LITERAL1
+
 CONFIG_DATA_SIZE  LITERAL1
 NUM_MENU_ITEMS  LITERAL1
 ESP_AT_HTML_HEAD  LITERAL1

diff --git a/library.json b/library.json
@@ -1,8 +1,8 @@
 {
   "name": "ESP_AT_WM_Lite",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "keywords": "wifi, MultiWiFi, ESP8266-AT, ESP32-AT, SAM DUE, SAMD, nRF52, STM32, rpi-pico, rp2040, nano-rp2040-connect, Credentials, config-portal, dynamic-params, EEPROM, FlashStorage-SAMD, FlashStorage-STM32, LittleFS, DueFlashStorage, AVR Mega, Double-Reset, FlashStorage, light-weight",
-  "description": "Light-Weight WiFi/Credentials Manager for AVR Mega, SAM DUE, SAMD21, SAMD51, nRF52, STM32, RP2040-based Nano_RP2040_connect, RASPBERRY_PI_PICO boards, etc. using ESP8266/ESP32-AT-command shields with web configuration portal. Powerful-yet-simple-to-use feature to enable adding dynamic custom parameters. You can also specify 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. Credentials and dynamic custom parameters are saved in EPROM, FlashStorage_SAMD, FlashStorage_STM32, DueFlashStorage or nRF52/RP2040 LittleFS.",
+  "description": "Light-Weight WiFi/Credentials Manager for AVR Mega, SAM DUE, SAMD21, SAMD51, nRF52, STM32, RP2040-based Nano_RP2040_connect, RASPBERRY_PI_PICO boards, etc. using ESP8266/ESP32-AT-command shields with web configuration portal. Powerful-yet-simple-to-use feature to enable adding dynamic custom parameters. You can also specify 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. Credentials and dynamic custom parameters are saved in EPROM, FlashStorage_SAMD, FlashStorage_STM32, FlashStorage_STM32F1, DueFlashStorage or nRF52/RP2040 LittleFS.",
   "authors":
   {
     "name":  "Khoi Hoang",
@@ -27,19 +27,25 @@
     {
       "owner": "khoih-prog",
       "name": "DoubleResetDetector_Generic",
-      "version": ">=1.7.3",
+      "version": ">=1.8.0",
       "platforms": ["*"]
     },
     {
       "owner": "khoih-prog",
       "name": "FlashStorage_STM32",
-      "version": ">=1.1.0",
+      "version": ">=1.2.0",
+      "platforms": ["*"]
+    },
+    {
+      "owner": "khoih-prog",
+      "name": "FlashStorage_STM32F1",
+      "version": "^1.1.0",
       "platforms": ["*"]
     },
     {
       "owner": "khoih-prog",
       "name": "FlashStorage_SAMD",
-      "version": "^1.2.1",
+      "version": "^1.3.2",
       "platforms": ["*"]
     },
     {
@@ -51,10 +57,11 @@
     {
       "owner": "khoih-prog",
       "name": "ESP8266_AT_WebServer",
-      "version": "^1.5.2",
+      "version": "^1.5.3",
       "platforms": ["*"]
     }
   ],
+  "license": "MIT",
   "frameworks": "*",
   "platforms": "*",
   "examples": "examples/*/*/*.ino"

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ESP_AT_WM_Lite
-version=1.5.0
+version=1.5.1
 author=Khoi Hoang
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 license=MIT
@@ -8,4 +8,4 @@ paragraph=Light-Weight WiFi/Credentials Manager for AVR Mega, SAM DUE, SAMD21, S
 category=Communication
 url=https://github.com/khoih-prog/ESP_AT_WM_Lite
 architectures=*
-depends=ESP8266_AT_WebServer,DoubleResetDetector_Generic,FlashStorage_SAMD,FlashStorage_STM32,DueFlashStorage
+depends=ESP8266_AT_WebServer,DoubleResetDetector_Generic,FlashStorage_SAMD,FlashStorage_STM32,FlashStorage_STM32F1,DueFlashStorage
diff --git a/platformio/platformio.ini b/platformio/platformio.ini
@@ -38,17 +38,19 @@ lib_compat_mode = strict
 
 lib_deps =  
 ; PlatformIO 4.x
-;  ESP8266_AT_WebServer@~1.5.2
-;  DoubleResetDetector_Generic@~1.7.3
-;  FlashStorage_STM32@~1.1.0
-;  FlashStorage_SAMD@~1.2.1
+;  ESP8266_AT_WebServer@~1.5.3
+;  DoubleResetDetector_Generic@~1.8.0
+;  FlashStorage_STM32@~1.2.0
+;  FlashStorage_STM32F1@~1.1.0
+;  FlashStorage_SAMD@~1.32
 ;  DueFlashStorage@~1.0.0
 
 ; PlatformIO 5.x  
- khoih-prog/ESP8266_AT_WebServer@~1.5.2
- khoih-prog/DoubleResetDetector_Generic@~1.7.3
- khoih-prog/FlashStorage_STM32@~1.1.0
- khoih-prog/FlashStorage_SAMD@~1.2.1
+ khoih-prog/ESP8266_AT_WebServer@~1.5.3
+ khoih-prog/DoubleResetDetector_Generic@~1.8.0
+ khoih-prog/FlashStorage_STM32@~1.2.0
+ khoih-prog/FlashStorage_STM32F1@~1.1.0 
+ khoih-prog/FlashStorage_SAMD@~1.3.2
  sebnil/DueFlashStorage@~1.0.0
 
 build_flags =

diff --git a/src/Esp8266_AT_WM_Lite.h b/src/Esp8266_AT_WM_Lite.h
@@ -8,7 +8,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_AT_WM_Lite
   Licensed under MIT license
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -26,6 +26,7 @@
   1.4.0   K Hoang      01/06/2021  Add support to Nano_RP2040_Connect, RASPBERRY_PI_PICO using RP2040 Arduino mbed core  
   1.4.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
   1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL
+  1.5.1   K Hoang      26/01/2022  Update to be compatible with new FlashStorage libraries. Add support to more SAMD/STM32 boards
  ***************************************************************************************************************************************/
 
 #ifndef Esp8266_AT_WM_Lite_h
@@ -39,7 +40,16 @@
   #error This code is intended to run on the Mega2560 platform! Please check your Tools->Board setting.
 #endif
 
-#define ESP_AT_WM_LITE_VERSION        "ESP_AT_WM_Lite v1.5.0"
+#ifndef ESP_AT_WM_LITE_VERSION
+  #define ESP_AT_WM_LITE_VERSION            "ESP_AT_WM_Lite v1.5.1"
+
+  #define ESP_AT_WM_LITE_VERSION_MAJOR      1
+  #define ESP_AT_WM_LITE_VERSION_MINOR      5
+  #define ESP_AT_WM_LITE_VERSION_PATCH      1
+
+  #define ESP_AT_WM_LITE_VERSION_INT        1005001
+
+#endif
 
 #define DEFAULT_BOARD_NAME            "AVR-MEGA"
 

diff --git a/src/Esp8266_AT_WM_Lite_DUE.h b/src/Esp8266_AT_WM_Lite_DUE.h
@@ -8,7 +8,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_AT_WM_Lite
   Licensed under MIT license
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -26,6 +26,7 @@
   1.4.0   K Hoang      01/06/2021  Add support to Nano_RP2040_Connect, RASPBERRY_PI_PICO using RP2040 Arduino mbed core  
   1.4.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
   1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL
+  1.5.1   K Hoang      26/01/2022  Update to be compatible with new FlashStorage libraries. Add support to more SAMD/STM32 boards
  ***************************************************************************************************************************************/
 
 #ifndef Esp8266_AT_WM_Lite_DUE_h
@@ -41,7 +42,16 @@
   #error This code is intended to run on the SAM DUE platform! Please check your Tools->Board setting.
 #endif
 
-#define ESP_AT_WM_LITE_VERSION        "ESP_AT_WM_Lite v1.5.0"
+#ifndef ESP_AT_WM_LITE_VERSION
+  #define ESP_AT_WM_LITE_VERSION            "ESP_AT_WM_Lite v1.5.1"
+
+  #define ESP_AT_WM_LITE_VERSION_MAJOR      1
+  #define ESP_AT_WM_LITE_VERSION_MINOR      5
+  #define ESP_AT_WM_LITE_VERSION_PATCH      1
+
+  #define ESP_AT_WM_LITE_VERSION_INT        1005001
+
+#endif
 
 #define DEFAULT_BOARD_NAME            "SAM-DUE"
 

diff --git a/src/Esp8266_AT_WM_Lite_Debug.h b/src/Esp8266_AT_WM_Lite_Debug.h
@@ -8,7 +8,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_AT_WM_Lite
   Licensed under MIT license
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -25,7 +25,8 @@
   1.3.0   K Hoang      12/05/2021  Add support to RASPBERRY_PI_PICO using Arduino-pico core
   1.4.0   K Hoang      01/06/2021  Add support to Nano_RP2040_Connect, RASPBERRY_PI_PICO using RP2040 Arduino mbed core  
   1.4.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
-  1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL        
+  1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL
+  1.5.1   K Hoang      26/01/2022  Update to be compatible with new FlashStorage libraries. Add support to more SAMD/STM32 boards      
  ***************************************************************************************************************************************/
 
 #ifndef Esp8266_AT_WM_Lite_Debug_h

diff --git a/src/Esp8266_AT_WM_Lite_Mbed_RPi_Pico.h b/src/Esp8266_AT_WM_Lite_Mbed_RPi_Pico.h
@@ -8,7 +8,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_AT_WM_Lite
   Licensed under MIT license
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -26,6 +26,7 @@
   1.4.0   K Hoang      01/06/2021  Add support to Nano_RP2040_Connect, RASPBERRY_PI_PICO using RP2040 Arduino mbed core  
   1.4.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
   1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL
+  1.5.1   K Hoang      26/01/2022  Update to be compatible with new FlashStorage libraries. Add support to more SAMD/STM32 boards
  ***************************************************************************************************************************************/
 
 #ifndef Esp8266_AT_WM_Lite_Mbed_RPi_Pico_h
@@ -41,7 +42,16 @@
   #error This code is intended to run on the RP2040 platform! Please check your Tools->Board setting.
 #endif
 
-#define ESP_AT_WM_LITE_VERSION        "ESP_AT_WM_Lite v1.5.0"
+#ifndef ESP_AT_WM_LITE_VERSION
+  #define ESP_AT_WM_LITE_VERSION            "ESP_AT_WM_Lite v1.5.1"
+
+  #define ESP_AT_WM_LITE_VERSION_MAJOR      1
+  #define ESP_AT_WM_LITE_VERSION_MINOR      5
+  #define ESP_AT_WM_LITE_VERSION_PATCH      1
+
+  #define ESP_AT_WM_LITE_VERSION_INT        1005001
+
+#endif
 
 #define DEFAULT_BOARD_NAME            "MBED-RP2040"
 

diff --git a/src/Esp8266_AT_WM_Lite_RPi_Pico.h b/src/Esp8266_AT_WM_Lite_RPi_Pico.h
@@ -8,7 +8,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_AT_WM_Lite
   Licensed under MIT license
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -26,6 +26,7 @@
   1.4.0   K Hoang      01/06/2021  Add support to Nano_RP2040_Connect, RASPBERRY_PI_PICO using RP2040 Arduino mbed core  
   1.4.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
   1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL
+  1.5.1   K Hoang      26/01/2022  Update to be compatible with new FlashStorage libraries. Add support to more SAMD/STM32 boards
  ***************************************************************************************************************************************/
 
 #ifndef Esp8266_AT_WM_Lite_RPi_Pico_h
@@ -41,7 +42,16 @@
   #error This code is intended to run on the RP2040 platform! Please check your Tools->Board setting.
 #endif
 
-#define ESP_AT_WM_LITE_VERSION        "ESP_AT_WM_Lite v1.5.0"
+#ifndef ESP_AT_WM_LITE_VERSION
+  #define ESP_AT_WM_LITE_VERSION            "ESP_AT_WM_Lite v1.5.1"
+
+  #define ESP_AT_WM_LITE_VERSION_MAJOR      1
+  #define ESP_AT_WM_LITE_VERSION_MINOR      5
+  #define ESP_AT_WM_LITE_VERSION_PATCH      1
+
+  #define ESP_AT_WM_LITE_VERSION_INT        1005001
+
+#endif
 
 #define DEFAULT_BOARD_NAME            "RP2040"
 

diff --git a/src/Esp8266_AT_WM_Lite_SAMD.h b/src/Esp8266_AT_WM_Lite_SAMD.h
@@ -8,7 +8,7 @@
 
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_AT_WM_Lite
   Licensed under MIT license
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -26,16 +26,20 @@
   1.4.0   K Hoang      01/06/2021  Add support to Nano_RP2040_Connect, RASPBERRY_PI_PICO using RP2040 Arduino mbed core  
   1.4.1   K Hoang      10/10/2021  Update `platform.ini` and `library.json`
   1.5.0   K Hoang      08/01/2022  Fix the blocking issue in loop() with configurable WIFI_RECON_INTERVAL
+  1.5.1   K Hoang      26/01/2022  Update to be compatible with new FlashStorage libraries. Add support to more SAMD/STM32 boards
  ***************************************************************************************************************************************/
 
 #ifndef Esp8266_AT_WM_Lite_SAMD_h
 #define Esp8266_AT_WM_Lite_SAMD_h
 
-#if    ( defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_MKRWIFI1010) \
-      || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRFox1200) || defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) \
-      || defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_SAMD_MKRVIDOR4000) || defined(__SAMD21G18A__) \
-      || defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(__SAMD21E18A__) || defined(__SAMD51__) || defined(__SAMD51J20A__) || defined(__SAMD51J19A__) \
-      || defined(__SAMD51G19A__) || defined(__SAMD21G18A__) )
+#if  ( defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_MKRWIFI1010) \
+    || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRFox1200) || defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310) \
+    || defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_SAMD_MKRVIDOR4000) \
+    || defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(__SAMD51__) || defined(__SAMD51J20A__) \
+    || defined(__SAMD51J19A__) || defined(__SAMD51G19A__) || defined(__SAMD51P19A__)  \
+    || defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) \
+    || defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) \
+    || defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__) )
   #if defined(ESP8266_AT_USE_SAMD)
     #undef ESP8266_AT_USE_SAMD
   #endif
@@ -44,16 +48,24 @@
   #error This code is intended to run on the SAMD platform! Please check your Tools->Board setting.
 #endif
 
-#define ESP_AT_WM_LITE_VERSION        "ESP_AT_WM_Lite v1.5.0"
+#ifndef ESP_AT_WM_LITE_VERSION
+  #define ESP_AT_WM_LITE_VERSION            "ESP_AT_WM_Lite v1.5.1"
+
+  #define ESP_AT_WM_LITE_VERSION_MAJOR      1
+  #define ESP_AT_WM_LITE_VERSION_MINOR      5
+  #define ESP_AT_WM_LITE_VERSION_PATCH      1
+
+  #define ESP_AT_WM_LITE_VERSION_INT        1005001
+
+#endif
 
 #define DEFAULT_BOARD_NAME            "SAMD"
 
 //////////////////////////////////////////////
 
 #include <ESP8266_AT_WebServer.h>
 // Include EEPROM-like API for FlashStorage
-//#include <FlashAsEEPROM.h>                //https://github.com/cmaglie/FlashStorage
-#include <FlashAsEEPROM_SAMD.h>                //https://github.com/khoih-prog/FlashStorage_SAMD
+#include <FlashStorage_SAMD.h>                //https://github.com/khoih-prog/FlashStorage_SAMD
 #include <Esp8266_AT_WM_Lite_Debug.h>
 
 //////////////////////////////////////////////