old mode 100644

new mode 100755

@@ -19,7 +19,7 @@ char mqttTEMP[23];

 char mqttLWT[22];

 const String model = "NodeMCU Dallas";

-const String ver = "v2.0.1";

+const String ver = "v2.1.0";

 const char* mqttServer = "mqtt.clickhome.ro";

 const int mqttPort = 1883;

 long loopTimer = 900000; // miliseconds - by default trimite la 15 minute

@@ -37,6 +37,8 @@ DallasTemperature sensors(&oneWire);

 WiFiClient espClient;

 PubSubClient client(espClient);

+bool readConfigFile();

+

 void generate_vars(){

   strcpy (mqttPassword, "8219CH");

@@ -124,19 +126,18 @@ void reconectez() {

     }

   }

 }

- 

+

 void setup()

 {

   Serial.begin(115200);

-  //generez variabilele

-  readFS();

-  // The extra parameters to be configured (can be either global or just in the setup)

-  // After connecting, parameter.getValue() will get you the configured value

-  // id/name placeholder/prompt default length

-  

-  WiFiManagerParameter custom_mqtt_user("user", "mqtt user", mqtt_user, 9);

-  WiFiManagerParameter custom_mqtt_devid("devid", "mqtt devid", mqtt_devid, 5);

+  // Mount the filesystem

+  bool result = SPIFFS.begin();

+  //Serial.println("SPIFFS opened: " + result);

+  

+  readConfigFile(); //citesc user si devid din memorie

+  generate_vars(); //genereaza topicurile de mqtt in baza mqtt_user si mqtt_devid

+  

   // ma conectez la AP via wifi

    WiFiManager wifi;

    wifi.setConfigPortalTimeout(120); // a timeout so the ESP doesn't hang waiting to be configured, for instance after a power failure

@@ -146,9 +147,6 @@ void setup()

   }

   delay(200);

-  strcpy(mqtt_user, custom_mqtt_user.getValue()); //citesc datele salvate anterior pe FS

-  strcpy(mqtt_devid, custom_mqtt_devid.getValue());

-  generate_vars(); //genereaza topicurile de mqtt in baza mqtt_user si mqtt_devid

   reconectez();

   client.setCallback(getMessage); //setez functia care parseaza mesajele venite prin mqtt

@@ -248,42 +246,41 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

    }  

 }

-void readFS(){

-  //read configuration from FS json

-  //Serial.println("mounting FS...");

-

-  if (SPIFFS.begin()) {

-    //Serial.println("mounted file system");

-    if (SPIFFS.exists("/config.json")) {

-      //file exists, reading and loading

-      //Serial.println("reading config file");

-      File configFile = SPIFFS.open("/config.json", "r");

-      if (configFile) {

-        //Serial.println("opened config file");

-        

-        size_t size = configFile.size();

-        // Allocate a buffer to store contents of the file.

-        std::unique_ptr<char[]> buf(new char[size]);

+bool readConfigFile() {

+  // this opens the config file in read-mode

+  File f = SPIFFS.open("/config.json", "r");

+  

+  if (!f) {

+    Serial.println("Configuration file not found");

+    return false;

+  } else {

+    // we could open the file

+    size_t size = f.size();

+    // Allocate a buffer to store contents of the file.

+    std::unique_ptr<char[]> buf(new char[size]);

-        configFile.readBytes(buf.get(), size);

-        DynamicJsonBuffer jsonBuffer;

-        JsonObject& json = jsonBuffer.parseObject(buf.get());

-        //json.printTo(Serial);

-        if (json.success()) {

-          //Serial.println("\nparsed json");

-          strcpy(mqtt_user, json["mqtt_user"]);

-          strcpy(mqtt_devid, json["mqtt_devid"]);

-        } else {

-          //Serial.println("failed to load json config");

-        }

-      }

+    // Read and store file contents in buf

+    f.readBytes(buf.get(), size);

+    // Closing file

+    f.close();

+    // Using dynamic JSON buffer which is not the recommended memory model, but anyway

+    // See https://github.com/bblanchon/ArduinoJson/wiki/Memory%20model

+    DynamicJsonBuffer jsonBuffer;

+    // Parse JSON string

+    JsonObject& json = jsonBuffer.parseObject(buf.get());

+    // Test if parsing succeeds.

+    if (!json.success()) {

+      Serial.println("JSON parseObject() failed");

+      return false;

     }

-  } else {

-    //Serial.println("failed to mount FS");

+    json.printTo(Serial);

+    strcpy(mqtt_user, json["mqtt_user"]);

+    strcpy(mqtt_devid, json["mqtt_devid"]);

   }

-  //end read

+  return true;

 }

+

 void loop()

 {

   if (!client.connected()) {

@@ -306,3 +303,4 @@ void loop()

       }

   }

 }

+