Fix issues and improve file handling.

Author: mobizt

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 mobizt
+Copyright (c) 2022 mobizt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-# The ESPForm for Arduino v 1.0.6
+# The ESPForm for Arduino v 1.0.7
 
 
 The simple HTML Form Elements data interchange library for ESP32/ESP8266 through the Webserver.
@@ -305,7 +305,7 @@ See [Full Examples](/examples) for the usages, below are the screenshots of thes
 
 The MIT License (MIT)
 
-Copyright (c) 2021 K. Suwatchai (Mobizt)
+Copyright (c) 2022 K. Suwatchai (Mobizt)
 
 
 Permission is hereby granted, free of charge, to any person returning a copy of

examples/Chart/Chart.ino

@@ -7,14 +7,14 @@
 
 #include <ESPForm.h>
 
-//For HTML content
+// For HTML content
 #include "html.h"
 
-//Your WiFi SSID and Password
+// Your WiFi SSID and Password
 #define WIFI_SSID "Your_WiFi_SSID"
 #define WIFI_PASSWORD "Your_WiFi_Password"
 
-//The AP
+// The AP
 String apSSID = "ESPForm";
 String apPSW = "12345678";
 
@@ -34,7 +34,7 @@ void formElementEventCallback(ESPFormClass::HTMLElementItem element)
   Serial.println("***********************************");
   Serial.println();
 
-  //If first knob value changed
+  // If first knob value changed
   if (element.id == "clear-btn")
   {
     ESPForm.runScript("clearData()");
@@ -44,7 +44,7 @@ void formElementEventCallback(ESPFormClass::HTMLElementItem element)
 void serverTimeoutCallback()
 {
 
-  //If server timeout (no client connected within specific time)
+  // If server timeout (no client connected within specific time)
   Serial.println("***********************************");
   Serial.println("Server timed out");
   Serial.println("***********************************");
@@ -63,10 +63,10 @@ void setup()
   WiFi.disconnect(true);
   WiFi.persistent(false);
 
-  //Set WiFi mode to STA (create ESP own network) or AP + STA (create ESP own network and join the WiFi network)
+  // Set WiFi mode to STA (create ESP own network) or AP + STA (create ESP own network and join the WiFi network)
   WiFi.mode(WIFI_AP_STA);
 
-  //For STA only or AP + STA mode
+  // For STA only or AP + STA mode
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("Connecting to Wi-Fi");
   while (WiFi.status() != WL_CONNECTED)
@@ -79,54 +79,58 @@ void setup()
   Serial.println(WiFi.localIP());
   Serial.println();
 
-  //generate seed numbers
+  // generate seed numbers
+#if defined(ESP32)
+  randomSeed(analogRead(34));
+#elif defined(ESP8266)
   randomSeed(analogRead(0));
+#endif
 
-  //Set the system time via NTP server
+  // Set the system time via NTP server
   Serial.println("***********************************");
   Serial.println("Set up time...");
   ESPForm.setClock(timezone);
   Serial.println("***********************************");
   Serial.println();
 
-  //FLASH_FS is defined in ESPFormFS.h
+  // DEFAULT_FLASH_FS is defined in ESPFormFS.h
 #if defined(ESP32)
-  FLASH_FS.begin(true);
+  DEFAULT_FLASH_FS.begin(true);
 #elif defined(ESP8266)
-  FLASH_FS.begin();
+  DEFAULT_FLASH_FS.begin();
 #endif
 
-  //Element Event Config existed?
-  if (!FLASH_FS.exists("/chart-test.json"))
+  // Element Event Config existed?
+  if (!DEFAULT_FLASH_FS.exists("/chart-test.json"))
   {
 
-    //Add html element event listener, id "knob1" for onchange event
+    // Add html element event listener, id "knob1" for onchange event
     ESPForm.addElementEventListener("clear-btn", ESPFormClass::EVENT_ON_CLICK);
 
     /*
     If the id of html elements changed, please update the ElementEventListener config
     */
 
-    //Save notification config
+    // Save notification config
     ESPForm.saveElementEventConfig("/chart-test.json", esp_form_storage_flash);
   }
   else
   {
-    //Load notification config
+    // Load notification config
     ESPForm.loadElementEventConfig("/chart-test.json", esp_form_storage_flash);
   }
 
-  //Add the html contents (in html.h) for the web page rendering
+  // Add the html contents (in html.h) for the web page rendering
 
-  //flash uint8_t array, file name, size of array, gzip compression
+  // flash uint8_t array, file name, size of array, gzip compression
   ESPForm.addFileData(index_html_gz, "index.html", sizeof(index_html_gz), true);
   ESPForm.addFileData(main_js_gz, "main.js", sizeof(main_js_gz), true);
   ESPForm.addFileData(highcharts_js_gz, "highcharts.js", sizeof(highcharts_js_gz), true);
 
-  //If AP only or AP + STA mode, set the AP's SSID and Password
+  // If AP only or AP + STA mode, set the AP's SSID and Password
   ESPForm.setAP(apSSID.c_str(), apPSW.c_str());
 
-  //Start ESPForm's Webserver
+  // Start ESPForm's Webserver
   ESPForm.begin(formElementEventCallback, serverTimeoutCallback, serverTimeout, true);
 
   ESPForm.startServer();
@@ -143,7 +147,7 @@ void setup()
 
 void loop()
 {
-  //If a client existed
+  // If a client existed
   if (ESPForm.getClientCount() > 0)
   {
 

examples/Knob/Knob.ino

@@ -78,15 +78,15 @@ void setup()
   Serial.println(WiFi.localIP());
   Serial.println();
 
-  //FLASH_FS is defined in ESPFormFS.h
+  //DEFAULT_FLASH_FS is defined in ESPFormFS.h
 #if defined(ESP32)
-  FLASH_FS.begin(true);
+  DEFAULT_FLASH_FS.begin(true);
 #elif defined(ESP8266)
-  FLASH_FS.begin();
+  DEFAULT_FLASH_FS.begin();
 #endif
 
   //Element Event Config existed?
-  if (!FLASH_FS.exists("/knob-test.json"))
+  if (!DEFAULT_FLASH_FS.exists("/knob-test.json"))
   {
 
     //Add html element event listener, id "knob1" for onchange event

examples/WiFiSettings/WiFiSettings.ino

@@ -148,15 +148,15 @@ bool loadConfig()
 void deleteConfigFile(const String &filename)
 {
     Serial.println("MAIN:  Delete config file...");
-    //FLASH_FS is defined in ESPFormFS.h
+    //DEFAULT_FLASH_FS is defined in ESPFormFS.h
 #if defined(ESP32)
-    FLASH_FS.begin(true);
+    DEFAULT_FLASH_FS.begin(true);
 #elif defined(ESP8266)
-    FLASH_FS.begin();
+    DEFAULT_FLASH_FS.begin();
 #endif
 
-    if (FLASH_FS.exists(filename))
-        FLASH_FS.remove(filename);
+    if (DEFAULT_FLASH_FS.exists(filename))
+        DEFAULT_FLASH_FS.remove(filename);
 
     Serial.println("MAIN:  Success");
     Serial.println();
@@ -166,14 +166,14 @@ bool loadWiFiConfig(const String &filename)
 {
 
     Serial.print("MAIN:  Load WiFi config...");
-    //FLASH_FS is defined in ESPFormFS.h
+    //DEFAULT_FLASH_FS is defined in ESPFormFS.h
 #if defined(ESP32)
-    FLASH_FS.begin(true);
+    DEFAULT_FLASH_FS.begin(true);
 #elif defined(ESP8266)
-    FLASH_FS.begin();
+    DEFAULT_FLASH_FS.begin();
 #endif
 
-    if (!FLASH_FS.exists(filename))
+    if (!DEFAULT_FLASH_FS.exists(filename))
     {
         Serial.println(" file is not existed");
         //Add new config.

library.json

@@ -8,5 +8,5 @@
     },
     "frameworks": "arduino",
     "platforms": "esp32, esp8266",
-    "version": "1.0.6"
+    "version": "1.0.7"
 }

library.properties

@@ -1,6 +1,6 @@
 name=ESPForm for Arduino
 
-version=1.0.6
+version=1.0.7
 
 author=Mobizt