@@ -9,23 +9,24 @@

 const char* mqtt_user="64x35up";

 const char* mqtt_devid="5566";

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

-#define RELAY 0 //  pinul de date 

+#define RELAY 2 //  pinul de date 

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

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

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttRELAY[24];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 const String model = "ESP8266 Releu";

-const String ver = "v1.1.0";

+const String ver = "v1.1.1";

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

 const int mqttPort = 1883;

 String mqttMessage;

-const unsigned long interval_update=1000*60*60; // face update la 60 min 

+const unsigned long interval_update=1000*60*5; // face update la 5 min 

 unsigned long t_update=0;

 WiFiClient espClient;

@@ -58,6 +59,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

@@ -148,7 +152,7 @@ void setup()

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif

@@ -8,28 +8,29 @@

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

 const char* mqtt_user="64x35up";

-const char* mqtt_devid="1791";

+const char* mqtt_devid="1903";

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

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttTEMP[24];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 const String model = "ESP8266 Dallas";

-const String ver = "v1.1.0";

+const String ver = "v1.1.1";

 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;

-const unsigned long interval_update=1000*60*60; // face update la 60 min 

+const unsigned long interval_update=1000*60*5; // face update la 5 min 

 unsigned long t_update=0;

 // senzor de temperatura DALLAS

@@ -68,6 +69,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

@@ -150,7 +154,7 @@ void setup()

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif

@@ -18,15 +18,16 @@ const char* mqtt_devid="1790";

 /********** 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];

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttTEMP[24];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 const String model = "ESP8266 ";

-const String ver = "v1.1.0";

+const String ver = "v1.1.1";

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

 const int mqttPort = 1883;

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

@@ -38,7 +39,7 @@ float h = 0;

 String mqttMessage;

 bool bDHTstarted;

 int acquireresult;

-const unsigned long interval_update=1000*60*60; // face update la 60 min 

+const unsigned long interval_update=1000*60*5; // face update la 5 min 

 unsigned long t_update=0;

@@ -80,6 +81,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

@@ -164,7 +168,7 @@ void setup()

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif

@@ -9,8 +9,8 @@

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

 // Variables

-const char* set_mqtt_user="quyhgw";

-const char* set_mqtt_devid="1870";

+const char* set_mqtt_user="64x35up";

+const char* set_mqtt_devid="1330";

 // Default configuration values

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

@@ -20,16 +20,17 @@ unsigned long t_update=0;

 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 mqttALM[24];

-char mqttPIR[22];

-char mqttLWT[22];

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttALM[25];

+char mqttPIR[23];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 const String model = "NodeMCU PIR";

-const String ver = "v2.1.1";

+const String ver = "v2.1.2";

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

 const int mqttPort = 1883;

 String mqttMessage;

@@ -69,6 +70,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

@@ -166,7 +170,7 @@ void setup()

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif

@@ -14,20 +14,21 @@

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

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttRELAY[24];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 const String model = "NodeMCU Releu";

-const String ver = "v2.1.0";

+const String ver = "v2.1.1";

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

 const int mqttPort = 1883;

 String mqttMessage;

-const unsigned long interval_update=1000*60*60; // face update la 60 min 

+const unsigned long interval_update=1000*60*5; // face update la 5 min 

 unsigned long t_update=0;

 WiFiClient espClient;

@@ -61,6 +62,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

@@ -170,7 +174,7 @@ void setup()

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif

@@ -12,25 +12,26 @@

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

 const String model = "NodeMCU Dallas";

-const String ver = "v2.2.0";

+const String ver = "v2.2.2";

 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;

-const unsigned long interval_update=1000*60*60; // face update la 60 min 

+const unsigned long interval_update=1000*60*5; // face update la 5 min 

 unsigned long t_update=0;

 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 mqttTEMP[23];

-char mqttLWT[22];

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttTEMP[24];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 // senzor de temperatura DALLAS

 #define ONE_WIRE_BUS D4  // pinul de date care se conecteaza la dallas

@@ -71,6 +72,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

@@ -166,7 +170,7 @@ void setup()

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif

@@ -21,15 +21,16 @@

 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 mqttTEMP[23];

-char mqttLWT[22];

-char mqttSTA[24];

+char mqttSUB[23];

+char espName[14];

+char mqttESP[23];

+char mqttTEMP[24];

+char mqttLWT[23];

+char mqttSTA[25];

+char wifiID[15];

 const String model = "NodeMCU ";

-const String ver = "v2.1.0";

+const String ver = "v2.1.1";

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

 const int mqttPort = 1883;

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

@@ -41,7 +42,7 @@ float h = 0;

 String mqttMessage;

 bool bDHTstarted;

 int acquireresult;

-const unsigned long interval_update=1000*60*60; // face update la 60 min 

+const unsigned long interval_update=1000*60*5; // face update la 5 min 

 unsigned long t_update=0;

 void dht_wrapper();

@@ -84,6 +85,9 @@ void generate_vars(){

   strcpy (mqttSTA, "tele/");

   strcat (mqttSTA, espName);

   strcat (mqttSTA, "/STATE");

+

+  strcpy (wifiID, "ClickHome-");

+  strcat (wifiID, mqtt_devid);

 }

 String ipToString(IPAddress ip){

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

    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 (!wifi.autoConnect(wifiID)) {

      #if DEBUG

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

      #endif