old mode 100644

new mode 100755

@@ -1,37 +1,65 @@

+#include <FS.h>                   //this needs to be first, e folosit de salvarea credentialelor pe FS

 #include <ESP8266WiFi.h>

 #include <PubSubClient.h>

 #include <WiFiManager.h>        //https://github.com/tzapu/WiFiManager

+#include <ArduinoJson.h>          //https://github.com/bblanchon/ArduinoJson pentru salvarea credentialelor in eprom

 #include <WiFiClient.h> 

 #include <OneWire.h>

+#include <DallasTemperature.h>

 #include <ESP8266HTTPClient.h>

 #include <ESP8266httpUpdate.h>

-#define RELAY D2 //  pinul de date (la mine am pus releu pe D2)

+#define DEBUG 0 //0=off 1=on

+#define RELAY LED_BUILTIN //  pinul de date D1 la care se conecteaza releul

-// Modifica cu datele tale

-const char* mqttUser = "qbzesh";

-const char* mqttPassword = "8219CHqbzesh";

-const char* mqttSUB = "cmnd/qbzesh-1432/ESP";

-const char* mqttESP = "stat/qbzesh-1432/ESP";

-const char* mqttRELAY = "stat/qbzesh-1432/RELAY";

-const char* mqttLWT = "tele/qbzesh-1432/LWT";

-const char* espName ="qbzesh-1432";

+char mqtt_user[9]; //le va lua din FS

+char mqtt_devid[5]; //le va lua din FS

+char mqttPassword[15]; //urmatoarele le va genera cu functia gen

+char mqttSUB[22];

+char espName[13];

+char mqttESP[22];

+char mqttRELAY[23];

+char mqttLWT[22];

-//#######################################################################

-// NU EDITA MAI JOS

-//#######################################################################

 const String model = "NodeMCU Releu";

-const String ver = "v1.0.5";

+const String ver = "v2.0.0";

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

 const int mqttPort = 1883;

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

 long lastMsg = 0;

 float loopTemp = 0;

+int inPin = 5;

 String mqttMessage;

 WiFiClient espClient;

 PubSubClient client(espClient);

- 

+bool readConfigFile();

+

+void generate_vars(){

+  strcpy (mqttPassword, "8219CH");

+  strcat (mqttPassword, mqtt_user);

+

+  strcpy (espName, mqtt_user);

+  strcat (espName, "-");

+  strcat (espName, mqtt_devid);

+

+  strcpy (mqttSUB, "cmnd/");

+  strcat (mqttSUB, espName);

+  strcat (mqttSUB, "/ESP");

+

+  strcpy (mqttESP, "stat/");

+  strcat (mqttESP, espName);

+  strcat (mqttESP, "/ESP");

+

+  strcpy (mqttRELAY, "stat/");

+  strcat (mqttRELAY, espName);

+  strcat (mqttRELAY, "/RELAY");

+

+  strcpy (mqttLWT, "tele/");

+  strcat (mqttLWT, espName);

+  strcat (mqttLWT, "/LWT");

+}

+

 String ipToString(IPAddress ip){

   String s="";

   for (int i=0; i<4; i++)

@@ -51,16 +79,26 @@ String getMacAddress() {

   return cMac;

 }

-void reconnect() 

-{

-  while (!client.connected()) 

-  {

+void reconectez() {

+  while (String(mqtt_user)==""){

+    #if DEBUG

+    Serial.println("Invalid user!");

+    #endif

+    delay(99999999);

+  }

+  

+  // ma conectez la mqtt server

+  while (!client.connected()) {

+    client.setServer(mqttServer, mqttPort);

+    #if DEBUG

     Serial.print("AtloopTempting MQTT connection...");

-     // Incerc sa ma reconectez cu LWT din 60 in 60 secunde

-    if (client.connect(espName, mqttUser, mqttPassword, mqttLWT, 1, 1, "Offline")) 

-    {

-        Serial.println("Releu reconectat la MQTT.");

-        client.publish(mqttLWT,"Online",TRUE);

+    #endif

+    // Incerc sa ma reconectez cu LWT din 5 in 5 secunde

+    if (client.connect(espName, mqtt_user, mqttPassword, mqttLWT, 1, 1, "Offline")) {

+      #if DEBUG

+      Serial.println("connected");

+      #endif

+      client.publish(mqttLWT,"Online",TRUE);

         // trimit informatii utile cand ma conectez

         String esp_info = "{\"ESPMac\":\"";

         esp_info += getMacAddress();

@@ -74,89 +112,88 @@ void reconnect()

         netinfo += "\"}";            

         client.publish(mqttESP, netinfo.c_str(),TRUE);

+        #if DEBUG

         Serial.println(netinfo);

+        #endif

         client.publish(mqttESP, esp_info.c_str(),TRUE);

+        #if DEBUG

         Serial.println(esp_info);

+        #endif

+    

+        // citesc starea si o trimit cand se reconecteaza si la boot

+        String json = "{\"Relay\":\"";

+        json += String (digitalRead(RELAY));

+        json += "\"}";

+        client.publish(mqttRELAY, json.c_str(),TRUE);

+

         client.subscribe(mqttSUB);

-    } 

-    else {

-        Serial.println("Reconectare MQTT esuata: ");

-        Serial.println(client.state());

-        Serial.println("fac o alta incercare in 60 de secunde");

-        delay(60000);

+    } else {

+      #if DEBUG

+      Serial.print("failed, rc=");

+      Serial.print(client.state());

+      Serial.println(" try again in 60 seconds");

+      #endif

+      // Wait 60 seconds before retrying

+      delay(60000);

     }

   }

 }

- 

+

+

 void setup()

 {

-  Serial.begin(115200);

   pinMode(RELAY,OUTPUT);

+  #if DEBUG

+  Serial.begin(115200);

+  #endif

+

+  // Mount the filesystem

+  bool result = SPIFFS.begin();

+  #if DEBUG

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

+  #endif

+  

+  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

    wifi.setTimeout(180); // sta AP 3 minute apoi se reseteaza din nou

    if (!wifi.autoConnect("ClickHome")) {

+     #if DEBUG

      Serial.println("timeout - going to sleep");

+     #endif

   }

   delay(200);

- 

-  // ma conectez la mqtt server

-  client.setServer(mqttServer, mqttPort);

-    while (!client.connected()) {

-    Serial.println("Connecting to MQTT...");

-    // fac connect cu LWT

-    if (client.connect(espName, mqttUser, mqttPassword, mqttLWT, 1, 1, "Offline")) {

-      // trimit starea Online pe topic LWT cand ma conectez

-      client.publish(mqttLWT,"Online",TRUE);

-      // trimit starea OFF cand il aprind

-      digitalWrite(RELAY,LOW);

-      client.publish(mqttRELAY, "{\"Relay\":\"0\"}", TRUE);

-      Serial.println("connected");

-      // trimit informatii utile cand ma conectez

-        String esp_info = "{\"ESPMac\":\"";

-        esp_info += getMacAddress();

-        esp_info += "\", \"IPAddress\":\"";

-        esp_info += ipToString(WiFi.localIP());    

-        esp_info += "\"}";       

-        String netinfo = "{\"Module\":\"";

-        netinfo += String (model);

-        netinfo += "\", \"Version\":\"";

-        netinfo += String (ver);

-        netinfo += "\"}";            

-        

-        client.publish(mqttESP, netinfo.c_str(),TRUE);

-        Serial.println(netinfo);

-        client.publish(mqttESP, esp_info.c_str(),TRUE);

-        Serial.println(esp_info);

-      client.subscribe(mqttSUB);

-    } 

-      else {

-        Serial.print("Conectare MQTT esuata: ");

-        Serial.print(client.state());

-        delay(2000);

-    }

-  }

-  // astept mesajul de la serverul MQTT

-  client.setCallback(getMessage);

- // pinMode(RELAY,OUTPUT);

+

+  reconectez();

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

+

 }

 void getMessage(char* topic, byte* payload, unsigned int length) {

   float t = 0;

   mqttMessage="";

+  #if DEBUG

   Serial.print("Message arrived in topic: ");

   Serial.println(topic);

   Serial.print("Message:");

+  #endif

   for (int i = 0; i < length; i++) {

     mqttMessage += (char)payload[i];

   }

+  #if DEBUG

   Serial.println(mqttMessage);

+  #endif

   // daca a primit on

   if (mqttMessage == "ON")

   {

+    #if DEBUG

     Serial.println("Pornesc releu");

+    #endif

     digitalWrite(RELAY,HIGH);

     String json = "{\"Relay\":\"1\"}";

     client.publish(mqttRELAY, json.c_str(),TRUE);

@@ -164,13 +201,15 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

   if (mqttMessage == "OFF")

   {

      long now = millis(); 

+    #if DEBUG

     Serial.println("Opresc releu");

     Serial.println(now);

+    #endif

     digitalWrite(RELAY,LOW);

     String json = "{\"Relay\":\"0\"}";

     client.publish(mqttRELAY, json.c_str(),TRUE);

   }

-   // procedura de software update via WEB

+// procedura de software update via WEB

    if (mqttMessage == "update")

    {

         String msg="Software update: ";

@@ -191,7 +230,9 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

                msg.concat(" success.");

                break;

         }

+        #if DEBUG

         Serial.println(msg);

+        #endif

    }

   if (mqttMessage == "stare")

@@ -203,17 +244,60 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

     client.publish(mqttRELAY, json.c_str(),TRUE);

   }

 }

+

+bool readConfigFile() {

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

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

+  

+  if (!f) {

+    #if DEBUG

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

+    #endif

+    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]);

+

+    // 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()) {

+      #if DEBUG

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

+      #endif

+      return false;

+    }

+    #if DEBUG

+    json.printTo(Serial);

+    #endif

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

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

+  }

+  return true;

+}

+

 void loop()

 {

   if (!client.connected()) 

   {

-    reconnect();

+    reconectez();

   }

   client.loop();

   long now = millis(); 

   if (now - lastMsg > loopTimer) 

   {

     lastMsg = now;

-       Serial.println("Nu fac nimic in bucla");

+    #if DEBUG

+    Serial.println("Nu fac nimic in bucla");

+    #endif

   }

-}

+}