Handle configuration file at startup

Author: Toon76

WifiModule/SenseData.cpp

@@ -56,6 +56,13 @@ void SenseData::init(void)
 void SenseData::run(void)
 {
 	sched.execute();
+/*  //can do some logic here
+  if(SensorArray[0].getValue() > 128)
+    SensorArray[7].setValue(1);
+  else
+    SensorArray[7].setValue(0);
+
+  */
 }
 
 //void addSensor(Sensor sensor);
@@ -77,6 +84,35 @@ String SenseData::getData(char* name)
   return ret;
 }
 
+
+int16_t SenseData::getValue(char* name)
+{
+  int ret = 0;
+  for(int i = 0;i<MAX_SENSOR_NB;i++)
+  {
+    if(SensorArray[i].m_name[0] != '\0')
+    {
+      if(strcmp(name,SensorArray[i].m_name) == 0 || strcmp("",name) == 0)
+      {
+        ret = SensorArray[i].getValue();
+      }
+    }
+  }
+  return ret;
+}
+
+void SenseData::setValue(char* name, int16_t value)
+{
+  Serial.print("setValue: ");Serial.print(name);Serial.print(" ");Serial.println(value);
+  for(int i = 0;i<MAX_SENSOR_NB;i++)
+  {
+    if(strcmp(name,SensorArray[i].m_name) == 0)
+    {
+      SensorArray[i].setValue(value);
+    }
+  }
+}
+
 String SenseData::getHistory(char* name,int qty,int long_history)
 {
   //manage qty and long_history argument
@@ -117,15 +153,5 @@ String SenseData::getHistory(char* name,int qty,int long_history)
   return ret;
 }
 
-void SenseData::setData(char* name, int value)
-{
-  Serial.print("setData: ");Serial.print(name);Serial.print(" ");Serial.println(value);
-  for(int i = 0;i<MAX_SENSOR_NB;i++)
-  {
-    if(strcmp(name,SensorArray[i].m_name) == 0)
-    {
-      SensorArray[i].setValue(value);
-    }
-  }
-}
+
 

WifiModule/SenseData.h

@@ -17,10 +17,11 @@ class SenseData
   void run(void);
   //void addSensor(Sensor sensor);
   String getData(char* name);
+  int16_t getValue(char* name);
+  void setValue(char* name, int16_t val);
   //void getData(Sensor sensor);
   String getHistory(char* name,int qty,int long_history);
   //void getHistory(Sensor sensor,int qty);
-  void setData(char* name, int value);
  private:
 };
 

WifiModule/WifiModule.ino

@@ -9,8 +9,13 @@
 WiFiServer server(80);
 File webFile;
 File confFile;
-const char* ssid = "HUAWEI";
-const char* password = "menerval";
+const char* configfile = "/my_data.json";
+
+
+String payload; 
+// Allocate the JSON document and Deserialize the JSON document
+//DynamicJsonDocument jsondoc(2048);
+StaticJsonDocument<1024> jsondoc;
 
 SenseData sense_data;
 //////////////////////////////
@@ -22,26 +27,36 @@ void setup()
   digitalWrite(D4, LOW);
   Serial.begin(115200);
 
-
-  sense_data.init();
-
   //SPIFFS initialization
   bool result = SPIFFS.begin();
-  Serial.print("SPIFFS opened: ");
-  Serial.println(result);
-  /*String str = "";
-  Dir dir = SPIFFS.openDir("/");
-  while (dir.next()) {
-      str += dir.fileName();
-      str += " / ";
-      str += dir.fileSize();
-      str += "\r\n";
+  Serial.println("SPIFFS opened: "+result);
+
+  confFile = SPIFFS.open(configfile, "r");
+  if (confFile) {
+    DeserializationError error = deserializeJson(jsondoc, confFile);
+    if (error)
+      Serial.println(F("Failed to read file, using default configuration"));
+    else
+    {
+      String WifiName = jsondoc["config"]["WifiName"];
+      /*Serial.print(F("Connect to : "));
+      Serial.println(WifiName);*/
+    }
+    confFile.close();
+  }
+  else
+  {
+    Serial.println("##### error while reading configuration");
   }
-  Serial.println(str);*/
+
+  sense_data.init();
 
   //Wifi initialization
-  Serial.print("Connect to "); Serial.println(ssid);
-  WiFi.begin(ssid, password);
+  String SSID = jsondoc["config"]["WifiName"];
+  String password = jsondoc["config"]["WifiPWD"];
+  /* -------------- to be removed !!!! ------------------*/ password = "menerval";
+  Serial.println("Connect to " + SSID);
+  WiFi.begin(SSID, password);
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
     Serial.print(".");
@@ -56,8 +71,6 @@ void setup()
 //////////////////////////////
 ////////////LOOP//////////////
 ////////////////////////////// 
-
-String payload; 
 bool got_config = false;
 void loop()
 {
@@ -68,10 +81,7 @@ void loop()
   if(got_config)
   {
     got_config = false;
-    // Allocate the JSON document and Deserialize the JSON document
-    //DynamicJsonDocument doc(2048);
-    StaticJsonDocument<1024> doc;
-    DeserializationError error = deserializeJson(doc, payload);
+    DeserializationError error = deserializeJson(jsondoc, payload);
     if (error) {
       Serial.print(F("deserializeJson() failed: "));
       Serial.println(error.c_str());
@@ -80,7 +90,7 @@ void loop()
     else
     {
       //save file
-      confFile = SPIFFS.open("/my_data.json", "w+");
+      confFile = SPIFFS.open(configfile, "w+");
       if (confFile) {
         confFile.print(payload);
         confFile.close();
@@ -89,7 +99,7 @@ void loop()
       {
         Serial.println("##### error while saving configuration");
       }
-      //const char* test = doc["config"]["WifiName"] ;
+      //const char* test = jsondoc["config"]["WifiName"] ;
     }
   }
 
@@ -142,7 +152,7 @@ void loop()
         }
         else if(path.indexOf("/setData") != -1){
           client.print(F("HTTP/1.1 200 OK\r\n"));
-          sense_data.setData(param_name,value);
+          sense_data.setValue(param_name,value);
         }
       }
       else

WifiModule/data/my_data.json

@@ -17,7 +17,7 @@
 	{
 		"sampling_T":15,
 		"history_T":600,
-		"WifiName":"blabla",
+		"WifiName":"HUAWEI",
 		"WifiPWD":"pwd"
 	}
   }