From 92f523e37ce7835dc94070beaba9a1944c11f2d5 Mon Sep 17 00:00:00 2001
From: lexa <lexa-ch@mail.ru>
Date: Thu, 22 Oct 2020 16:42:37 +0300
Subject: [PATCH] UL Millis

---
 ESP_BigRoom/src/main.cpp | 3 ++-
 ESP_MidRoom/src/main.cpp | 7 ++++---
 MainDoor/src/main.cpp    | 3 ++-
 VT_ESP8266/src/main.cpp  | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ESP_BigRoom/src/main.cpp b/ESP_BigRoom/src/main.cpp
index 78c679e..58efd26 100644
--- a/ESP_BigRoom/src/main.cpp
+++ b/ESP_BigRoom/src/main.cpp
@@ -90,6 +90,7 @@ void setup() {
 	mqttClient.onMessage(onMqttMessage);
 	mqttClient.onPublish(onMqttPublish);
 	mqttClient.setServer(mqtt_server, 1883);
+  mqttClient.setClientId("BigRoom");
 
   pinMode(MOV_SENS, INPUT_PULLUP);
   pinMode(P_SENS, OUTPUT);
@@ -175,7 +176,7 @@ void loop() {
       }
     }
     else if(minCnt % 10 == 0){
-      if(mqttClient.connected()) mqttClient.publish("/home/bigroom/millis", 0, false, itoa(millis(), v, 10));
+      if(mqttClient.connected()) mqttClient.publish("/home/bigroom/millis", 0, false, ultoa(millis(), v, 10));
       //b_led.start();
     }
   }
diff --git a/ESP_MidRoom/src/main.cpp b/ESP_MidRoom/src/main.cpp
index 906d61e..514e129 100644
--- a/ESP_MidRoom/src/main.cpp
+++ b/ESP_MidRoom/src/main.cpp
@@ -86,6 +86,7 @@ void setup() {
 	mqttClient.onMessage(onMqttMessage);
 	mqttClient.onPublish(onMqttPublish); */
 	mqttClient.setServer(mqtt_server, 1883);
+  mqttClient.setClientId("MidRoom");
 
   pinMode(MOV_SENS, INPUT_PULLUP);
   pinMode(P_SENS, OUTPUT);
@@ -138,7 +139,7 @@ void loop() {
   if (digitalRead(MOV_SENS) != old_mov){
     old_mov = digitalRead(MOV_SENS);
     //Serial1.println(F("Change mov detected"));
-    mqttClient.publish("/home/midroom/move", 0, false, old_mov ? "1" : "0");
+    mqttClient.publish("/home/midroom/move", 1, false, old_mov ? "1" : "0");
   }
   
   if(cRun + 999 < millis()){
@@ -147,7 +148,7 @@ void loop() {
     if(abs(adc - lastADC) > 50){
       lastADC = adc;
       itoa(adc, v, 10);
-      mqttClient.publish("/home/midroom/light", 0, false, v);
+      mqttClient.publish("/home/midroom/light", 1, false, v);
     }
     if(minCnt % 20 == 0){
       co2 = mhz19.getCO2();
@@ -191,7 +192,7 @@ void loop() {
       }
     }
     else if(minCnt % 10 == 0){
-      itoa(millis(), v, 10);
+      ultoa(millis(), v, 10);
       if(mqttClient.connected()){
         mqttClient.publish("/home/midroom/millis", 0, false, v);
         // dtostrf(t, 5, 1,v);
diff --git a/MainDoor/src/main.cpp b/MainDoor/src/main.cpp
index 3045add..e49de0d 100644
--- a/MainDoor/src/main.cpp
+++ b/MainDoor/src/main.cpp
@@ -170,6 +170,7 @@ void setup() {
 	mqttClient.onMessage(onMqttMessage);
 	mqttClient.onPublish(onMqttPublish);
 	mqttClient.setServer(mqtt_server, 1883);
+  mqttClient.setClientId("Door");
 
   Wire.begin();
   // Serial.println("Begin Scan");
@@ -295,7 +296,7 @@ void loop() {
     if(nSec > 99){
       if(mqttClient.connected()){
         char v[11];
-        itoa(millis(), v, 10);
+        ultoa(millis(), v, 10);
         analogWrite(L_MSG, 1);
         l_run = millis();
         l_m = true;
diff --git a/VT_ESP8266/src/main.cpp b/VT_ESP8266/src/main.cpp
index f4ade81..857bff6 100644
--- a/VT_ESP8266/src/main.cpp
+++ b/VT_ESP8266/src/main.cpp
@@ -84,6 +84,7 @@ void setup()
 	mqttClient.onMessage(onMqttMessage);
 	mqttClient.onPublish(onMqttPublish);
 	mqttClient.setServer(mqtt_server, 1883);
+  mqttClient.setClientId("VT");
 
   Serial.println("WF");
   connectToWifi();