From 2bdad88c5b80bcbb965a77026e70707fc4e6a373 Mon Sep 17 00:00:00 2001 From: Khoi Hoang <57012152+khoih-prog@users.noreply.github.com> Date: Sat, 15 May 2021 02:09:38 -0400 Subject: [PATCH] v1.3.1 to fix createHTML bug ### Release v1.3.1 1. Fix createHTML bug. --- CONTRIBUTING.md | 4 +- README.md | 69 ++++++++++++------- examples/Mega_WiFiNINA/Mega_WiFiNINA.ino | 3 +- examples/SAMD_WiFiNINA/SAMD_WiFiNINA.ino | 3 +- .../SAMD_WiFiNINA_MQTT/SAMD_WiFiNINA_MQTT.ino | 6 +- .../SAM_DUE_WiFiNINA/SAM_DUE_WiFiNINA.ino | 3 +- .../SAM_DUE_WiFiNINA_MQTT.ino | 6 +- examples/STM32_WiFiNINA/STM32_WiFiNINA.ino | 3 +- .../STM32_WiFiNINA_MQTT.ino | 6 +- examples/Teensy_WiFiNINA/Teensy_WiFiNINA.ino | 3 +- .../Teensy_WiFiNINA_MQTT.ino | 6 +- examples/nRF52_WiFiNINA/nRF52_WiFiNINA.ino | 3 +- .../nRF52_WiFiNINA_MQTT.ino | 6 +- library.json | 6 +- library.properties | 2 +- platformio/platformio.ini | 8 +-- src/WiFiManager_NINA_Lite.h | 5 +- src/WiFiManager_NINA_Lite_DUE.h | 20 ++---- src/WiFiManager_NINA_Lite_Debug.h | 3 +- src/WiFiManager_NINA_Lite_SAMD.h | 9 +-- src/WiFiManager_NINA_Lite_SAMD_CP.h | 18 +---- src/WiFiManager_NINA_Lite_STM32.h | 20 ++---- src/WiFiManager_NINA_Lite_Teensy.h | 20 ++---- src/WiFiManager_NINA_Lite_nRF52.h | 5 +- 24 files changed, 111 insertions(+), 126 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 42647a8c..1a2693ce 100644 --- 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.13) or Platform.io version -* `SAMD` Core Version (e.g. Arduino SAMD core v1.8.11, Adafruit SAMD core v1.6.7, Seeed Studio SAMD v1.8.1) +* `SAMD` Core Version (e.g. Arduino SAMD core v1.8.11, Adafruit SAMD core v1.6.8, Seeed Studio SAMD v1.8.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.13 Arduino SAMD Core Version 1.8.11 OS: Ubuntu 20.04 LTS -Linux xy-Inspiron-3593 5.4.0-72-generic #80-Ubuntu SMP Mon Apr 12 17:35:00 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux +Linux xy-Inspiron-3593 5.4.0-73-generic #82-Ubuntu SMP Wed Apr 14 17:39:42 UTC 2021 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 index 8e4939e2..1751cbc8 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ * [Currently supported Boards](#currently-supported-boards) * [Currently supported WiFi shields/modules](#currently-supported-wifi-shieldsmodules) * [Changelog](#changelog) + * [Release v1.3.1](#release-v131) * [Major Release v1.3.0](#major-release-v130) * [Release v1.2.0](#release-v120) * [Release v1.1.3](#release-v113) @@ -45,6 +46,7 @@ * [7. For STM32 boards](#7-for-stm32-boards) * [7.1. For STM32 boards to use LAN8720](#71-for-stm32-boards-to-use-lan8720) * [7.2. For STM32 boards to use Serial1](#72-for-stm32-boards-to-use-serial1) + * [8. For RP2040-based boards](#8-for-rp2040-based-boards) * [How It Works](#how-it-works) * [How to use](#how-to-use) * [ 1. Basic usage](#1-basic-usage) @@ -192,6 +194,10 @@ This [**WiFiManager_NINA_Lite** library](https://github.com/khoih-prog/WiFiManag ## Changelog +### Release v1.3.1 + +1. Fix createHTML bug. + ### Major Release v1.3.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) @@ -277,7 +283,7 @@ Thanks to [Thor Johnson](https://github.com/thorathome) to test, suggest and enc 3. [`Teensy core 1.51`](https://www.pjrc.com/teensy/td_download.html) for Teensy (4.1, 4.0, 3.6, 3.5, 3,2, 3.1, 3.0, LC) boards 4. [`Arduino SAM DUE core 1.6.12+`](https://github.com/arduino/ArduinoCore-sam) for SAM DUE ARM Cortex-M3 boards 5. [`Arduino SAMD core 1.8.11+`](https://www.arduino.cc/en/Guide/ArduinoM0) for SAMD ARM Cortex-M0+ boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-samd.svg)](https://github.com/arduino/ArduinoCore-samd/releases/latest) - 6. [`Adafruit SAMD core 1.6.7+`](https://www.adafruit.com/) for SAMD ARM Cortex-M0+ and M4 boards (Nano 33 IoT, etc.). [![GitHub release](https://img.shields.io/github/release/adafruit/ArduinoCore-samd.svg)](https://github.com/adafruit/ArduinoCore-samd/releases/latest) + 6. [`Adafruit SAMD core 1.6.8+`](https://www.adafruit.com/) for SAMD ARM Cortex-M0+ and M4 boards (Nano 33 IoT, etc.). [![GitHub release](https://img.shields.io/github/release/adafruit/ArduinoCore-samd.svg)](https://github.com/adafruit/ArduinoCore-samd/releases/latest) 7. [`Seeeduino SAMD core 1.8.1+`](https://github.com/Seeed-Studio/ArduinoCore-samd) for SAMD21/SAMD51 boards (XIAO M0, Wio Terminal, etc.). [![Latest release](https://img.shields.io/github/release/Seeed-Studio/ArduinoCore-samd.svg)](https://github.com/Seeed-Studio/ArduinoCore-samd/releases/latest/) 8. [`Adafruit nRF52 v0.21.0+`](https://www.adafruit.com) for nRF52 boards such as Adafruit NRF52840_FEATHER, NRF52832_FEATHER, NRF52840_FEATHER_SENSE, NRF52840_ITSYBITSY, NRF52840_CIRCUITPLAY, NRF52840_CLUE, NRF52840_METRO, NRF52840_PCA10056, PARTICLE_XENON, **NINA_B302_ublox**, etc. [![GitHub release](https://img.shields.io/github/release/adafruit/Adafruit_nRF52_Arduino.svg)](https://github.com/adafruit/Adafruit_nRF52_Arduino/releases/latest) 9. [`Functional-VLPP library v1.0.2+`](https://github.com/khoih-prog/functional-vlpp) to use server's lambda function. To install. check [![arduino-library-badge](https://www.ardu-badge.com/badge/Functional-Vlpp.svg?)](https://www.ardu-badge.com/Functional-Vlpp) @@ -285,10 +291,10 @@ Thanks to [Thor Johnson](https://github.com/thorathome) to test, suggest and enc 11. [`WiFi101 library v0.16.1+`](https://github.com/arduino-libraries/WiFi101) if using WINC1500/WiFi101 shields (MKR1000, etc.). To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/WiFi101.svg?)](https://www.ardu-badge.com/WiFi101) 12. [`WiFiWebServer library v1.1.1+`](https://github.com/khoih-prog/WiFiWebServer). To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/WiFiWebServer.svg?)](https://www.ardu-badge.com/WiFiWebServer) 13. [`FlashStorage_SAMD library v1.1.0+`](https://github.com/khoih-prog/FlashStorage_SAMD) for SAMD21 and SAMD51 boards (ZERO, MKR, NANO_33_IOT, M0, M0 Pro, AdaFruit Itsy-Bitsy M4, etc.). [![GitHub release](https://img.shields.io/github/release/khoih-prog/FlashStorage_SAMD.svg)](https://github.com/khoih-prog/FlashStorage_SAMD/releases/latest) -14. [`FlashStorage_STM32 library v1.0.1+`](https://github.com/khoih-prog/FlashStorage_STM32) for STM32F/L/H/G/WB/MP1 boards. To install. check [![arduino-library-badge](https://www.ardu-badge.com/badge/FlashStorage_STM32.svg?)](https://www.ardu-badge.com/FlashStorage_STM32) +14. [`FlashStorage_STM32 library v1.1.0+`](https://github.com/khoih-prog/FlashStorage_STM32) for STM32F/L/H/G/WB/MP1 boards. To install. check [![arduino-library-badge](https://www.ardu-badge.com/badge/FlashStorage_STM32.svg?)](https://www.ardu-badge.com/FlashStorage_STM32) 15. [`DueFlashStorage library v1.0.0+`](https://github.com/sebnil/DueFlashStorage) for SAM DUE. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/DueFlashStorage.svg?)](https://www.ardu-badge.com/DueFlashStorage) 16. [`Adafruit's LittleFS/InternalFS`](www.adafruit.com) for nRF52 -17. [`DoubleResetDetector_Generic v1.0.3+`](https://github.com/khoih-prog/DoubleResetDetector_Generic). To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/DoubleResetDetector_Generic.svg?)](https://www.ardu-badge.com/DoubleResetDetector_Generic) +17. [`DoubleResetDetector_Generic v1.2.0+`](https://github.com/khoih-prog/DoubleResetDetector_Generic). To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/DoubleResetDetector_Generic.svg?)](https://www.ardu-badge.com/DoubleResetDetector_Generic) --- @@ -415,11 +421,11 @@ Whenever the above-mentioned compiler error issue is fixed with the new Arduino #### 5. For Adafruit SAMD boards - ***To be able to automatically detect and display BOARD_NAME on Adafruit SAMD (Itsy-Bitsy M4, etc) boards***, you have to copy the file [Adafruit SAMD platform.txt](Packages_Patches/adafruit/hardware/samd/1.6.7) into Adafruit samd directory (~/.arduino15/packages/adafruit/hardware/samd/1.6.7). + ***To be able to automatically detect and display BOARD_NAME on Adafruit SAMD (Itsy-Bitsy M4, etc) boards***, you have to copy the file [Adafruit SAMD platform.txt](Packages_Patches/adafruit/hardware/samd/1.6.8) into Adafruit samd directory (~/.arduino15/packages/adafruit/hardware/samd/1.6.8). -Supposing the Adafruit SAMD core version is 1.6.7. This file must be copied into the directory: +Supposing the Adafruit SAMD core version is 1.6.8. This file must be copied into the directory: -- `~/.arduino15/packages/adafruit/hardware/samd/1.6.7/platform.txt` +- `~/.arduino15/packages/adafruit/hardware/samd/1.6.8/platform.txt` Whenever a new version is installed, remember to copy this file into the new version directory. For example, new version is x.yy.zz This file must be copied into the directory: @@ -441,7 +447,7 @@ This file must be copied into the directory: #### 7. For STM32 boards -#### 7.1. For STM32 boards to use LAN8720 +#### 7.1 For STM32 boards to use LAN8720 To use LAN8720 on some STM32 boards @@ -449,12 +455,12 @@ To use LAN8720 on some STM32 boards - **Discovery (DISCO_F746NG)** - **STM32F4 boards (BLACK_F407VE, BLACK_F407VG, BLACK_F407ZE, BLACK_F407ZG, BLACK_F407VE_Mini, DIYMORE_F407VGT, FK407M1)** -you have to copy the files [stm32f4xx_hal_conf_default.h](Packages_Patches/STM32/hardware/stm32/1.9.0/system/STM32F4xx) and [stm32f7xx_hal_conf_default.h](Packages_Patches/STM32/hardware/stm32/1.9.0/system/STM32F7xx) into STM32 stm32 directory (~/.arduino15/packages/STM32/hardware/stm32/1.9.0/system) to overwrite the old files. +you have to copy the files [stm32f4xx_hal_conf_default.h](Packages_Patches/STM32/hardware/stm32/2.0.0/system/STM32F4xx) and [stm32f7xx_hal_conf_default.h](Packages_Patches/STM32/hardware/stm32/2.0.0/system/STM32F7xx) into STM32 stm32 directory (~/.arduino15/packages/STM32/hardware/stm32/2.0.0/system) to overwrite the old files. -Supposing the STM32 stm32 core version is 1.9.0. These files must be copied into the directory: +Supposing the STM32 stm32 core version is 2.0.0. These files must be copied into the directory: -- `~/.arduino15/packages/STM32/hardware/stm32/1.9.0/system/STM32F4xx/stm32f4xx_hal_conf_default.h` for STM32F4. -- `~/.arduino15/packages/STM32/hardware/stm32/1.9.0/system/STM32F7xx/stm32f7xx_hal_conf_default.h` for Nucleo-144 STM32F7. +- `~/.arduino15/packages/STM32/hardware/stm32/2.0.0/system/STM32F4xx/stm32f4xx_hal_conf_default.h` for STM32F4. +- `~/.arduino15/packages/STM32/hardware/stm32/2.0.0/system/STM32F7xx/stm32f7xx_hal_conf_default.h` for Nucleo-144 STM32F7. Whenever a new version is installed, remember to copy this file into the new version directory. For example, new version is x.yy.zz, theses files must be copied into the corresponding directory: @@ -463,14 +469,14 @@ theses files must be copied into the corresponding directory: - `~/.arduino15/packages/STM32/hardware/stm32/x.yy.zz/system/STM32F7xx/stm32f7xx_hal_conf_default.h -#### 7.2. For STM32 boards to use Serial1 +#### 7.2 For STM32 boards to use Serial1 -**To use Serial1 on some STM32 boards without Serial1 definition (Nucleo-144 NUCLEO_F767ZI, Nucleo-64 NUCLEO_L053R8, etc.) boards**, you have to copy the files [STM32 variant.h](Packages_Patches/STM32/hardware/stm32/1.9.0) into STM32 stm32 directory (~/.arduino15/packages/STM32/hardware/stm32/1.9.0). You have to modify the files corresponding to your boards, this is just an illustration how to do. +**To use Serial1 on some STM32 boards without Serial1 definition (Nucleo-144 NUCLEO_F767ZI, Nucleo-64 NUCLEO_L053R8, etc.) boards**, you have to copy the files [STM32 variant.h](Packages_Patches/STM32/hardware/stm32/2.0.0) into STM32 stm32 directory (~/.arduino15/packages/STM32/hardware/stm32/2.0.0). You have to modify the files corresponding to your boards, this is just an illustration how to do. -Supposing the STM32 stm32 core version is 1.9.0. These files must be copied into the directory: +Supposing the STM32 stm32 core version is 2.0.0. These files must be copied into the directory: -- `~/.arduino15/packages/STM32/hardware/stm32/1.9.0/variants/NUCLEO_F767ZI/variant.h` for Nucleo-144 NUCLEO_F767ZI. -- `~/.arduino15/packages/STM32/hardware/stm32/1.9.0/variants/NUCLEO_L053R8/variant.h` for Nucleo-64 NUCLEO_L053R8. +- `~/.arduino15/packages/STM32/hardware/stm32/2.0.0/variants/NUCLEO_F767ZI/variant.h` for Nucleo-144 NUCLEO_F767ZI. +- `~/.arduino15/packages/STM32/hardware/stm32/2.0.0/variants/NUCLEO_L053R8/variant.h` for Nucleo-64 NUCLEO_L053R8. Whenever a new version is installed, remember to copy this file into the new version directory. For example, new version is x.yy.zz, theses files must be copied into the corresponding directory: @@ -478,6 +484,19 @@ theses files must be copied into the corresponding directory: - `~/.arduino15/packages/STM32/hardware/stm32/x.yy.zz/variants/NUCLEO_F767ZI/variant.h` - `~/.arduino15/packages/STM32/hardware/stm32/x.yy.zz/variants/NUCLEO_L053R8/variant.h` +#### 8. For RP2040-based boards + + ***To be able to automatically detect and display BOARD_NAME on Seeeduino SAMD (RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040, GENERIC_RP2040, etc) boards***, you have to copy the file [RP2040 platform.txt](Packages_Patches/rp2040/hardware/rp2040/1.2.2) into rp2040 directory (~/.arduino15/packages/rp2040/hardware/rp2040/1.2.2). + +Supposing the rp2040 core version is 1.2.2. This file must be copied into the directory: + +- `~/.arduino15/packages/rp2040/hardware/rp2040/1.2.2/platform.txt` + +Whenever a new version is installed, remember to copy this file into the new version directory. For example, new version is x.yy.zz +This file must be copied into the directory: + +- `~/.arduino15/packages/rp2040/hardware/rp2040/x.yy.zz/platform.txt` + --- --- @@ -1455,7 +1474,7 @@ This is the terminal output when running [**SAMD_WiFiNINA**](examples/SAMD_WiFiN ``` Starting SAMD_WiFiNINA on SAMD NANO_33_IOT -WiFiManager_NINA_Lite v1.3.0 +WiFiManager_NINA_Lite v1.3.1 [WN] Hostname=SAMD-Master-Controller Flag read = 0xffffffff No doubleResetDetected @@ -1507,7 +1526,7 @@ FFFFFFFFF ``` Start SAMD_WiFiNINA on SAMD NANO_33_IOT -WiFiManager_NINA_Lite v1.3.0 +WiFiManager_NINA_Lite v1.3.1 [WN] Hostname=SAMD-WIFININA51F485 [WN] CrCCSum=44880,CrRCSum=-1 [WN] CCSum=53040,RCSum=-1 @@ -1554,7 +1573,7 @@ FFFFFFFFF ``` Start SAMD_WiFiNINA on SAMD NANO_33_IOT -WiFiManager_NINA_Lite v1.3.0 +WiFiManager_NINA_Lite v1.3.1 [WN] Hostname=SAMD-Master-Controller Flag read = 0xd0d04321 No doubleResetDetected @@ -1631,7 +1650,7 @@ HHHHHHHHHH HHHHHHHHHH ``` Start SAMD_WiFiNINA on SAMD NANO_33_IOT -WiFiManager_NINA_Lite v1.3.0 +WiFiManager_NINA_Lite v1.3.1 [WN] Hostname=SAMD-Master-Controller Flag read = 0xd0d04321 No doubleResetDetected @@ -1695,7 +1714,7 @@ FF ``` Start SAMD_WiFiNINA on SAMD NANO_33_IOT -WiFiManager_NINA_Lite v1.3.0 +WiFiManager_NINA_Lite v1.3.1 [WN] Hostname=SAMD-Master-Controller Flag read = 0xd0d04321 No doubleResetDetected @@ -1751,7 +1770,7 @@ HHHHHHHHH HHHHHHHHHH ``` Start SAMD_WiFiNINA on SAMD NANO_33_IOT -WiFiManager_NINA_Lite v1.3.0 +WiFiManager_NINA_Lite v1.3.1 [WN] Hostname=SAMD-Master-Controller Flag read = 0xd0d01234 doubleResetDetected @@ -1826,6 +1845,10 @@ Sometimes, the library will only work if you update the `WiFiNINA module/shield` ## Releases +### Release v1.3.1 + +1. Fix createHTML bug. + ### Major Release v1.3.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) @@ -1907,7 +1930,7 @@ Thanks to [Thor Johnson](https://github.com/thorathome) to test, suggest and enc ### TO DO -1. Support more boards +1. Support more boards (RP2040, Nano RP2040 Connect, etc) ### DONE diff --git a/examples/Mega_WiFiNINA/Mega_WiFiNINA.ino b/examples/Mega_WiFiNINA/Mega_WiFiNINA.ino index 50b08016..b8e5fc95 100644 --- a/examples/Mega_WiFiNINA/Mega_WiFiNINA.ino +++ b/examples/Mega_WiFiNINA/Mega_WiFiNINA.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/SAMD_WiFiNINA/SAMD_WiFiNINA.ino b/examples/SAMD_WiFiNINA/SAMD_WiFiNINA.ino index 286f8c2d..f3587bfc 100644 --- a/examples/SAMD_WiFiNINA/SAMD_WiFiNINA.ino +++ b/examples/SAMD_WiFiNINA/SAMD_WiFiNINA.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/SAMD_WiFiNINA_MQTT/SAMD_WiFiNINA_MQTT.ino b/examples/SAMD_WiFiNINA_MQTT/SAMD_WiFiNINA_MQTT.ino index dfec6ae8..cc6a4b9c 100644 --- a/examples/SAMD_WiFiNINA_MQTT/SAMD_WiFiNINA_MQTT.ino +++ b/examples/SAMD_WiFiNINA_MQTT/SAMD_WiFiNINA_MQTT.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,12 +26,12 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ /**************************************************************************************************************************** You have to modify file ./libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp as follows to avoid dtostrf error, if exists - //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || \ - // defined(ARDUINO_ARCH_SAMD) + //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_ARCH_SAMD) #if !( ESP32 || ESP8266 || defined(CORE_TEENSY) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) ) static char *dtostrf(double val, signed char width, unsigned char prec, char *sout) { diff --git a/examples/SAM_DUE_WiFiNINA/SAM_DUE_WiFiNINA.ino b/examples/SAM_DUE_WiFiNINA/SAM_DUE_WiFiNINA.ino index ac3ee437..0656f4e1 100644 --- a/examples/SAM_DUE_WiFiNINA/SAM_DUE_WiFiNINA.ino +++ b/examples/SAM_DUE_WiFiNINA/SAM_DUE_WiFiNINA.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/SAM_DUE_WiFiNINA_MQTT/SAM_DUE_WiFiNINA_MQTT.ino b/examples/SAM_DUE_WiFiNINA_MQTT/SAM_DUE_WiFiNINA_MQTT.ino index dc50f7bd..e4a137c1 100644 --- a/examples/SAM_DUE_WiFiNINA_MQTT/SAM_DUE_WiFiNINA_MQTT.ino +++ b/examples/SAM_DUE_WiFiNINA_MQTT/SAM_DUE_WiFiNINA_MQTT.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,12 +26,12 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ /**************************************************************************************************************************** You have to modify file ./libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp as follows to avoid dtostrf error - //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || \ - // defined(ARDUINO_ARCH_SAMD) + //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_ARCH_SAMD) #if !( ESP32 || ESP8266 || defined(CORE_TEENSY) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) ) static char *dtostrf(double val, signed char width, unsigned char prec, char *sout) { diff --git a/examples/STM32_WiFiNINA/STM32_WiFiNINA.ino b/examples/STM32_WiFiNINA/STM32_WiFiNINA.ino index 7a46fcb8..ed175fa2 100644 --- a/examples/STM32_WiFiNINA/STM32_WiFiNINA.ino +++ b/examples/STM32_WiFiNINA/STM32_WiFiNINA.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/STM32_WiFiNINA_MQTT/STM32_WiFiNINA_MQTT.ino b/examples/STM32_WiFiNINA_MQTT/STM32_WiFiNINA_MQTT.ino index 94afc223..e25507ff 100644 --- a/examples/STM32_WiFiNINA_MQTT/STM32_WiFiNINA_MQTT.ino +++ b/examples/STM32_WiFiNINA_MQTT/STM32_WiFiNINA_MQTT.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,12 +26,12 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ /**************************************************************************************************************************** You have to modify file ./libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp as follows to avoid dtostrf error - //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || \ - // defined(ARDUINO_ARCH_SAMD) + //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_ARCH_SAMD) #if !( ESP32 || ESP8266 || defined(CORE_TEENSY) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) ) static char *dtostrf(double val, signed char width, unsigned char prec, char *sout) { diff --git a/examples/Teensy_WiFiNINA/Teensy_WiFiNINA.ino b/examples/Teensy_WiFiNINA/Teensy_WiFiNINA.ino index 542bf7df..36cc7242 100644 --- a/examples/Teensy_WiFiNINA/Teensy_WiFiNINA.ino +++ b/examples/Teensy_WiFiNINA/Teensy_WiFiNINA.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/Teensy_WiFiNINA_MQTT/Teensy_WiFiNINA_MQTT.ino b/examples/Teensy_WiFiNINA_MQTT/Teensy_WiFiNINA_MQTT.ino index 99dcc45f..a973af87 100644 --- a/examples/Teensy_WiFiNINA_MQTT/Teensy_WiFiNINA_MQTT.ino +++ b/examples/Teensy_WiFiNINA_MQTT/Teensy_WiFiNINA_MQTT.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,12 +26,12 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ /**************************************************************************************************************************** You have to modify file ./libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp as follows to avoid dtostrf error - //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || \ - // defined(ARDUINO_ARCH_SAMD) + //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_ARCH_SAMD) #if !( ESP32 || ESP8266 || defined(CORE_TEENSY) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) ) static char *dtostrf(double val, signed char width, unsigned char prec, char *sout) { diff --git a/examples/nRF52_WiFiNINA/nRF52_WiFiNINA.ino b/examples/nRF52_WiFiNINA/nRF52_WiFiNINA.ino index 0d9d35ec..de3e3bd2 100644 --- a/examples/nRF52_WiFiNINA/nRF52_WiFiNINA.ino +++ b/examples/nRF52_WiFiNINA/nRF52_WiFiNINA.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #include "defines.h" diff --git a/examples/nRF52_WiFiNINA_MQTT/nRF52_WiFiNINA_MQTT.ino b/examples/nRF52_WiFiNINA_MQTT/nRF52_WiFiNINA_MQTT.ino index 193a4fd1..941e5c14 100644 --- a/examples/nRF52_WiFiNINA_MQTT/nRF52_WiFiNINA_MQTT.ino +++ b/examples/nRF52_WiFiNINA_MQTT/nRF52_WiFiNINA_MQTT.ino @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,13 +26,13 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ /**************************************************************************************************************************** You have to modify file ./libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp as follows to avoid dtostrf error - //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || \ - // defined(ARDUINO_ARCH_SAMD) + //#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_ARCH_SAMD) #if !( ESP32 || ESP8266 || defined(CORE_TEENSY) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) ) static char *dtostrf(double val, signed char width, unsigned char prec, char *sout) { diff --git a/library.json b/library.json index cc3bec91..f1279069 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "WiFiManager_NINA_Lite", - "version": "1.3.0", + "version": "1.3.1", "keywords": "wifi, wi-fi, MutiWiFi, WiFiNINA, AVR Mega, SAM DUE, SAMD, nRF52, STM32, Credentials, config-portal, dynamic-params, light-weight, EEPROM, FlashStorage, FlashStorage-SAMD, FlashStorage-STM32, DueFlashStorage, LittleFS, Double-Reset", "description": "Library to configure MultiWiFi/Credentials at runtime for AVR Mega, Teensy, SAM DUE, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, nRF52, etc. boards running WiFiNINA modules/shields. 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/InternalFS, EEPROM, FlashStorage_SAMD, FlashStorage_STM32 or DueFlashStorage. DoubleDetectDetector feature permits entering Config Portal as requested.", "authors": @@ -33,7 +33,7 @@ { "owner": "khoih.prog", "name": "DoubleResetDetector_Generic", - "version": "^1.0.3", + "version": "^1.2.0", "platforms": ["*"] }, { @@ -45,7 +45,7 @@ { "owner": "khoih.prog", "name": "FlashStorage_STM32", - "version": "^1.0.1", + "version": "^1.1.0", "platforms": ["*"] }, { diff --git a/library.properties b/library.properties index 5fb517a8..2b074dd2 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=WiFiManager_NINA_Lite -version=1.3.0 +version=1.3.1 author=Khoi Hoang maintainer=Khoi Hoang license=MIT diff --git a/platformio/platformio.ini b/platformio/platformio.ini index 740f5700..c62cd601 100644 --- a/platformio/platformio.ini +++ b/platformio/platformio.ini @@ -38,16 +38,16 @@ lib_deps = ; WiFiNINA_Generic@>=1.8.5 ; WiFiWebServer@>=1.1.1 ; Functional-Vlpp@>=1.0.2 -; DoubleResetDetector_Generic@>=1.0.3 +; DoubleResetDetector_Generic@>=1.2.0 ; FlashStorage_SAMD@>=1.1.0 -; FlashStorage_STM32@>=1.0.1 +; FlashStorage_STM32@>=1.1.0 ; PlatformIO 5.x khoih.prog/WiFiNINA_Generic@>=1.8.5 khoih-prog/WiFiWebServer@>=1.1.1 khoih-prog/Functional-Vlpp@>=1.0.2 - khoih.prog/DoubleResetDetector_Generic@>=1.0.3 + khoih.prog/DoubleResetDetector_Generic@>=1.2.0 khoih.prog/FlashStorage_SAMD@>=1.1.0 - khoih.prog/FlashStorage_STM32@>=1.0.1 + khoih.prog/FlashStorage_STM32@>=1.1.0 build_flags = ; set your debug output (default=Serial) diff --git a/src/WiFiManager_NINA_Lite.h b/src/WiFiManager_NINA_Lite.h index c7e994b6..5d8b24c3 100644 --- a/src/WiFiManager_NINA_Lite.h +++ b/src/WiFiManager_NINA_Lite.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_h @@ -39,7 +40,7 @@ #error This code is intended to run on the AVR Mega, Mega2560, Mega ADK platform! Please check your Tools->Board setting. #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include #include diff --git a/src/WiFiManager_NINA_Lite_DUE.h b/src/WiFiManager_NINA_Lite_DUE.h index 705f3134..afe09449 100644 --- a/src/WiFiManager_NINA_Lite_DUE.h +++ b/src/WiFiManager_NINA_Lite_DUE.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_DUE_h @@ -44,7 +45,7 @@ #error This code is intended to run on the SAM DUE platform! Please check your Tools->Board setting. #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include #include @@ -1545,20 +1546,7 @@ class WiFiManager_NINA_Lite #endif root_html_template += String(WIFININA_HTML_HEAD_END) + WIFININA_FLDSET_START; - -#if USE_DYNAMIC_PARAMETERS - for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) - { - pitem = String(WIFININA_HTML_PARAM); - - pitem.replace("{b}", myMenuItems[i].displayName); - pitem.replace("{v}", myMenuItems[i].id); - pitem.replace("{i}", myMenuItems[i].id); - - root_html_template += pitem; - } -#endif - + #if SCAN_WIFI_NETWORKS WN_LOGDEBUG1(WiFiNetworksFound, F(" SSIDs found, generating HTML now")); // Replace HTML with , based on WiFi network scan in startConfigurationMode() diff --git a/src/WiFiManager_NINA_Lite_Debug.h b/src/WiFiManager_NINA_Lite_Debug.h index d20984fd..68387d15 100644 --- a/src/WiFiManager_NINA_Lite_Debug.h +++ b/src/WiFiManager_NINA_Lite_Debug.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_Debug_h diff --git a/src/WiFiManager_NINA_Lite_SAMD.h b/src/WiFiManager_NINA_Lite_SAMD.h index 672d9b78..95376c28 100644 --- a/src/WiFiManager_NINA_Lite_SAMD.h +++ b/src/WiFiManager_NINA_Lite_SAMD.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_SAMD_h @@ -44,7 +45,7 @@ #error This code is intended to run on the SAMD platform! Please check your Tools->Board setting. #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include @@ -1133,8 +1134,8 @@ class WiFiManager_NINA_Lite WIFININA_config.header[HEADER_MAX_LEN - 1] = 0; for (uint16_t i = 0; i < NUM_WIFI_CREDENTIALS; i++) { - WIFININA_config.WiFi_Creds[i].wifi_ssid[SSID_MAX_LEN - 1] = 0; - WIFININA_config.WiFi_Creds[i].wifi_pw [PASS_MAX_LEN - 1] = 0; + WIFININA_config.WiFi_Creds[i].wifi_ssid[SSID_MAX_LEN - 1] = 0; + WIFININA_config.WiFi_Creds[i].wifi_pw [PASS_MAX_LEN - 1] = 0; } WIFININA_config.board_name[BOARD_NAME_MAX_LEN - 1] = 0; } diff --git a/src/WiFiManager_NINA_Lite_SAMD_CP.h b/src/WiFiManager_NINA_Lite_SAMD_CP.h index 5c2b83f7..3c6e9f42 100644 --- a/src/WiFiManager_NINA_Lite_SAMD_CP.h +++ b/src/WiFiManager_NINA_Lite_SAMD_CP.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. *****************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_SAMD_h @@ -44,7 +45,7 @@ #error This code is intended to run on the SAMD platform! Please check your Tools->Board setting. #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include // Include EEPROM-like API for FlashStorage @@ -1571,20 +1572,7 @@ class WiFiManager_NINA_Lite #endif root_html_template += String(WIFININA_HTML_HEAD_END) + WIFININA_FLDSET_START; - -#if USE_DYNAMIC_PARAMETERS - for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) - { - pitem = String(WIFININA_HTML_PARAM); - - pitem.replace("{b}", myMenuItems[i].displayName); - pitem.replace("{v}", myMenuItems[i].id); - pitem.replace("{i}", myMenuItems[i].id); - root_html_template += pitem; - } -#endif - #if SCAN_WIFI_NETWORKS WN_LOGDEBUG1(WiFiNetworksFound, F(" SSIDs found, generating HTML now")); // Replace HTML with , based on WiFi network scan in startConfigurationMode() diff --git a/src/WiFiManager_NINA_Lite_STM32.h b/src/WiFiManager_NINA_Lite_STM32.h index 5d07cd23..d3c42a3e 100644 --- a/src/WiFiManager_NINA_Lite_STM32.h +++ b/src/WiFiManager_NINA_Lite_STM32.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_STM32_h @@ -44,7 +45,7 @@ #error This code is intended to run on STM32 platform! Please check your Tools->Board setting. #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include #include @@ -1504,20 +1505,7 @@ class WiFiManager_NINA_Lite #endif root_html_template += String(WIFININA_HTML_HEAD_END) + WIFININA_FLDSET_START; - -#if USE_DYNAMIC_PARAMETERS - for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) - { - pitem = String(WIFININA_HTML_PARAM); - - pitem.replace("{b}", myMenuItems[i].displayName); - pitem.replace("{v}", myMenuItems[i].id); - pitem.replace("{i}", myMenuItems[i].id); - - root_html_template += pitem; - } -#endif - + #if SCAN_WIFI_NETWORKS WN_LOGDEBUG1(WiFiNetworksFound, F(" SSIDs found, generating HTML now")); // Replace HTML with , based on WiFi network scan in startConfigurationMode() diff --git a/src/WiFiManager_NINA_Lite_Teensy.h b/src/WiFiManager_NINA_Lite_Teensy.h index c4b275db..2b696501 100644 --- a/src/WiFiManager_NINA_Lite_Teensy.h +++ b/src/WiFiManager_NINA_Lite_Teensy.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_Teensy_h @@ -41,7 +42,7 @@ #error Teensy 2.0 not supported yet #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include #include @@ -1526,20 +1527,7 @@ class WiFiManager_NINA_Lite #endif root_html_template += String(WIFININA_HTML_HEAD_END) + WIFININA_FLDSET_START; - -#if USE_DYNAMIC_PARAMETERS - for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++) - { - pitem = String(WIFININA_HTML_PARAM); - - pitem.replace("{b}", myMenuItems[i].displayName); - pitem.replace("{v}", myMenuItems[i].id); - pitem.replace("{i}", myMenuItems[i].id); - - root_html_template += pitem; - } -#endif - + #if SCAN_WIFI_NETWORKS WN_LOGDEBUG1(WiFiNetworksFound, F(" SSIDs found, generating HTML now")); // Replace HTML with , based on WiFi network scan in startConfigurationMode() diff --git a/src/WiFiManager_NINA_Lite_nRF52.h b/src/WiFiManager_NINA_Lite_nRF52.h index 896e1688..c606d7fe 100644 --- a/src/WiFiManager_NINA_Lite_nRF52.h +++ b/src/WiFiManager_NINA_Lite_nRF52.h @@ -8,7 +8,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite Licensed under MIT license - Version: 1.3.0 + Version: 1.3.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -26,6 +26,7 @@ 1.1.3 K Hoang 12/04/2021 Fix invalid "blank" Config Data treated as Valid. 1.2.0 K Hoang 14/04/2021 Optional one set of WiFi Credentials. Enforce WiFi PWD minimum 8 chars 1.3.0 Michael H 21/04/2021 Enable scan of WiFi networks for selection in Configuration Portal + 1.3.1 K Hoang 15/05/2021 Fix createHTML bug. **********************************************************************************************************************************/ #ifndef WiFiManager_NINA_Lite_nRF52_h @@ -43,7 +44,7 @@ #error This code is intended to run on the SAMD platform! Please check your Tools->Board setting. #endif -#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.0" +#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.3.1" #include