GitList
Browse code

Modificat JSON si la ESP8266 incrementat minorul +1

Andrei Bucur authored on 05/03/2018 13:57:23
Showing 3 changed files
arduino/ESP8266/releu/releu.ino
History View file @ 48803c8
... ... 
@@ -20,7 +20,7 @@ char mqttRELAY[23];
20 20 
 char mqttLWT[22];
21 21
22 22 
 const String model = "ESP8266 Releu";
23 
-const String ver = "v1.0.0";
23 
+const String ver = "v1.0.1";
24 24 
 const char* mqttServer = "mqtt.clickhome.ro";
25 25 
 const int mqttPort = 1883;
26 26 
 long loopTimer = 900000; // miliseconds - by default trimite la 15 minute
... ... 
@@ -92,12 +92,12 @@ void reconectez() {
92 92 
         // trimit informatii utile cand ma conectez
93 93 
         String esp_info = "{\"ESPMac\":\"";
94 94 
         esp_info += getMacAddress();
95 
-        esp_info += "\", \"IPAddress\":\"";
95 
+        esp_info += "\",\"IPAddress\":\"";
96 96 
         esp_info += ipToString(WiFi.localIP());
97 97 
         esp_info += "\"}";
98 98 
         String netinfo = "{\"Module\":\"";
99 99 
         netinfo += String (model);
100 
-        netinfo += "\", \"Version\":\"";
100 
+        netinfo += "\",\"Version\":\"";
101 101 
         netinfo += String (ver);
102 102 
         netinfo += "\"}";
103 103
arduino/ESP8266/senzor-dallas/senzor-dallas.ino
History View file @ 48803c8
... ... 
@@ -21,7 +21,7 @@ char mqttTEMP[23];
21 21 
 char mqttLWT[22];
22 22
23 23 
 const String model = "ESP8266 Dallas";
24 
-const String ver = "v1.0.0";
24 
+const String ver = "v1.0.1";
25 25 
 const char* mqttServer = "mqtt.clickhome.ro";
26 26 
 const int mqttPort = 1883;
27 27 
 long loopTimer = 900000; // miliseconds - by default trimite la 15 minute
... ... 
@@ -100,12 +100,12 @@ void reconectez() {
100 100 
       // trimit informatii utile cand ma conectez
101 101 
         String esp_info = "{\"ESPMac\":\"";
102 102 
         esp_info += getMacAddress();
103 
-        esp_info += "\", \"IPAddress\":\"";
103 
+        esp_info += "\",\"IPAddress\":\"";
104 104 
         esp_info += ipToString(WiFi.localIP());
105 105 
         esp_info += "\"}";
106 106 
         String netinfo = "{\"Module\":\"";
107 107 
         netinfo += String (model);
108 
-        netinfo += "\", \"Version\":\"";
108 
+        netinfo += "\",\"Version\":\"";
109 109 
         netinfo += String (ver);
110 110 
         netinfo += "\"}";
111 111
... ... 
@@ -117,7 +117,7 @@ void reconectez() {
117 117 
         #if DEBUG
118 118 
         Serial.println(esp_info);
119 119 
         #endif
120 
-        client.publish(mqttESP, "15 minute",TRUE); // trimit intervalul default
120 
+        client.publish(mqttESP, "{\"LoopInterval\":\"15 minute\"}",TRUE); // trimit intervalul default
121 121 
         client.subscribe(mqttSUB);
122 122 
     } else {
123 123 
       #if DEBUG
arduino/ESP8266/senzor-dht/senzor-dht.ino
History View file @ 48803c8
... ... 
@@ -25,7 +25,7 @@ char mqttTEMP[23];
25 25 
 char mqttLWT[22];
26 26
27 27 
 const String model = "ESP8266 ";
28 
-const String ver = "v1.0.0";
28 
+const String ver = "v1.0.1";
29 29 
 const char* mqttServer = "mqtt.clickhome.ro";
30 30 
 const int mqttPort = 1883;
31 31 
 long loopTimer = 900000; // miliseconds - by default trimite la 15 minute
... ... 
@@ -111,14 +111,14 @@ void reconectez() {
111 111 
       // trimit informatii utile cand ma conectez
112 112 
         String esp_info = "{\"ESPMac\":\"";
113 113 
         esp_info += getMacAddress();
114 
-        esp_info += "\", \"IPAddress\":\"";
114 
+        esp_info += "\",\"IPAddress\":\"";
115 115 
         esp_info += ipToString(WiFi.localIP());
116 116 
         esp_info += "\"}";
117 117 
         String netinfo = "{\"Module\":\"";
118 118 
         netinfo += String (model);
119 119 
         netinfo += "DHT";
120 120 
         netinfo += String (DHTTYPE);
121 
-        netinfo += "\", \"Version\":\"";
121 
+        netinfo += "\",\"Version\":\"";
122 122 
         netinfo += String (ver);
123 123 
         netinfo += "\"}";
124 124
... ... 
@@ -130,7 +130,7 @@ void reconectez() {
130 130 
         #if DEBUG
131 131 
         Serial.println(esp_info);
132 132 
         #endif
133 
-        client.publish(mqttESP, "15 minute",TRUE); // trimit intervalul default
133 
+        client.publish(mqttESP, "{\"LoopInterval\":\"15 minute\"}",TRUE); // trimit intervalul default
134 134 
         client.subscribe(mqttSUB);
135 135 
     } else {
136 136 
       #if DEBUG
... ... 
@@ -196,7 +196,7 @@ void getMessage(char* topic, byte* payload, unsigned int length) {
196 196 
            delay(10);
197 197 
            String json = "{\"Temp\":";
198 198 
            json += String (t);
199 
-           json += ", \"Humi\":";
199 
+           json += ",\"Humi\":";
200 200 
            json += String (h);
201 201 
            json += "}";
202 202 
            client.publish(mqttTEMP, json.c_str(),TRUE);
... ... 
@@ -273,7 +273,7 @@ void loop()
273 273 
            delay(10);
274 274 
            String val = "{\"Temp\":";
275 275 
            val += String (loopTemp);
276 
-           val += ", \"Humi\":";
276 
+           val += ",\"Humi\":";
277 277 
            val += String (loopHumi);
278 278 
            val += "}";
279 279 
            client.publish(mqttESP, val.c_str(),TRUE);