new file mode 100755

@@ -0,0 +1,258 @@

+#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>

+

+//ESP8266-01 nu are suficienta memorie pt update http

+const char* mqtt_user="64x35up";

+const char* mqtt_devid="1790";

+#define ONE_WIRE_BUS 2 // pinul de date

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

+

+/********** NU edita mai jos ******************/

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

+char mqttSUB[22];

+char espName[13];

+char mqttESP[22];

+char mqttTEMP[23];

+char mqttLWT[22];

+

+const String model = "ESP8266 Dallas";

+const String ver = "v1.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;

+String mqttMessage;

+

+// senzor de temperatura DALLAS

+OneWire oneWire(ONE_WIRE_BUS);

+DallasTemperature sensors(&oneWire);

+

+//*********************************************************************

+

+WiFiClient espClient;

+PubSubClient client(espClient);

+

+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 (mqttTEMP, "stat/");

+  strcat (mqttTEMP, espName);

+  strcat (mqttTEMP, "/TEMP");

+

+  strcpy (mqttLWT, "tele/");

+  strcat (mqttLWT, espName);

+  strcat (mqttLWT, "/LWT");

+}

+

+String ipToString(IPAddress ip){

+  String s="";

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

+    s += i  ? "." + String(ip[i]) : String(ip[i]);

+  return s;

+}

+

+String getMacAddress() {

+  byte mac[6];

+  WiFi.macAddress(mac);

+  String cMac = "";

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

+    cMac += String(mac[i],HEX);

+    if(i<5)

+    cMac += "-";

+  }

+  cMac.toUpperCase();

+  return cMac;

+}

+

+void reconectez() {

+  

+  // ma conectez la mqtt server

+  while (!client.connected()) {

+    client.setServer(mqttServer, mqttPort);

+    #if DEBUG

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

+    #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();

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

+        #if DEBUG

+        Serial.println(netinfo);

+        #endif

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

+        #if DEBUG

+        Serial.println(esp_info);

+        #endif

+        client.publish(mqttESP, "15 minute",TRUE); // trimit intervalul default

+        client.subscribe(mqttSUB);

+    } 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()

+{

+  #if DEBUG

+  Serial.begin(115200);

+  #endif

+

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

+

+  reconectez();

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

+

+  sensors.begin();

+}

+

+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 sendTemp trimite temperatura 

+  if (mqttMessage == "temp")

+  {

+    #if DEBUG

+    Serial.println("Trimit temperatura");

+    #endif

+    sensors.setResolution(12);

+    sensors.requestTemperatures(); // Send the command to get Temperatures

+    t = sensors.getTempCByIndex(0);

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

+      json += String (t);

+      json += "}";

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

+      #if DEBUG

+      Serial.println(json);

+      #endif

+  }  

+// reset la ESP

+  if (mqttMessage == "reset")

+  {

+      String lastwords="Am fost resetat ...";

+      client.publish(mqttESP, lastwords.c_str(), TRUE);

+      delay (3000);

+      ESP.reset();

+      delay (5000);

+  }

+  // daca a primit valoarea in minute seteaza loopTimer si-l trimite in DB

+  

+   if (mqttMessage == "debug")

+   {

+        loopTimer=30000; // setez sa trimita valori la 30 de secunde ca sa fac debug

+        client.publish(mqttESP, "{\"LoopInterval\":\"30 secunde\"}",TRUE);   

+   }

+   if (mqttMessage == "10")

+   {

+        loopTimer=600000; // setez sa trimita valori la 10 minute   

+        client.publish(mqttESP, "{\"LoopInterval\":\"10 minute\"}",TRUE);

+   }

+   if (mqttMessage == "15")

+   {

+        loopTimer=900000; // setez sa trimita valori la 15 minute

+        client.publish(mqttESP, "{\"LoopInterval\":\"15 minute\"}",TRUE);   

+   }

+   if (mqttMessage == "30")

+   {

+        loopTimer=1800000; // setez sa trimita valori la 30 de minute

+        client.publish(mqttESP, "{\"LoopInterval\":\"30 de minute\"}",TRUE);   

+   }   

+   if (mqttMessage == "60")

+   {

+        loopTimer=3600000; // setez sa trimita valori la o ora

+        client.publish(mqttESP, "{\"LoopInterval\":\"o ora\"}",TRUE);   

+   }

+   if (mqttMessage == "stop")

+   {

+        loopTimer=3600000000; // setez sa nu trimita valori

+        client.publish(mqttESP, "{\"LoopInterval\":\"oprit\"}",TRUE);

+   }  

+}

+

+void loop()

+{

+  if (!client.connected()) {

+    reconectez();

+  }

+  client.loop();

+  long now = millis();

+  if (now - lastMsg > loopTimer) {

+    lastMsg = now;

+    sensors.setResolution(12);

+    sensors.requestTemperatures(); // Send the command to get loopTemperatures

+    loopTemp = sensors.getTempCByIndex(0);

+    #if DEBUG

+    Serial.println(loopTemp);

+    #endif

+    if((loopTemp > -20) && (loopTemp <60))

+      {

+     String val = "{\"Temp\":";

+      val += String (loopTemp);

+      val += "}";

+      client.publish(mqttESP, val.c_str(),TRUE);

+      }

+  }

+}

+

@@ -1,4 +1,3 @@

-#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

@@ -14,7 +13,7 @@ const char* mqtt_devid="1790";

 // senzor de temperatura DHT

 #define DHTPIN 2 // pinul de date 

 #define DHTTYPE DHT22 // DHT11 (albastru) DHT22 (alb)

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

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

 /********** NU edita mai jos ******************/

@@ -49,8 +48,6 @@ void dht_wrapper()

 WiFiClient espClient;

 PubSubClient client(espClient);

-bool readConfigFile();

-

 void generate_vars(){

   strcpy (mqttPassword, "8219CH");

@@ -98,13 +95,7 @@ String getMacAddress() {

 }

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

@@ -159,12 +150,6 @@ void setup()

   Serial.begin(115200);

   #endif

-  // Mount the filesystem

-  bool result = SPIFFS.begin();

-  #if DEBUG

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

-  #endif

-  

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

   // ma conectez la AP via wifi

@@ -27,7 +27,6 @@ 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;

 // senzor de temperatura DALLAS

@@ -170,7 +169,6 @@ void setup()

   reconectez();

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

-  pinMode(inPin, INPUT);

   sensors.begin();

 }

@@ -185,7 +185,6 @@ void setup()

   reconectez();

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

-

 }

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