GitList
Browse code

Modificat JSON sa nu mai contina spatii Incrementat la versiune minorul V2.X.+1

Andrei Bucur authored on 05/03/2018 13:23:40
Showing 3 changed files
arduino/nodemcu/releu/releu.ino
History View file @ d3ae377
... ... 
@@ -21,7 +21,7 @@ char mqttRELAY[23];
21 21 
 char mqttLWT[22];
22 22
23 23 
 const String model = "NodeMCU Releu";
24 
-const String ver = "v2.0.0";
24 
+const String ver = "v2.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
arduino/nodemcu/senzor-dallas/senzor-dallas.ino
History View file @ d3ae377
... ... 
@@ -21,7 +21,7 @@ char mqttTEMP[23];
21 21 
 char mqttLWT[22];
22 22
23 23 
 const String model = "NodeMCU Dallas";
24 
-const String ver = "v2.1.1";
24 
+const String ver = "v2.1.2";
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
... ... 
@@ -109,12 +109,12 @@ void reconectez() {
109 109 
       // trimit informatii utile cand ma conectez
110 110 
         String esp_info = "{\"ESPMac\":\"";
111 111 
         esp_info += getMacAddress();
112 
-        esp_info += "\", \"IPAddress\":\"";
112 
+        esp_info += "\",\"IPAddress\":\"";
113 113 
         esp_info += ipToString(WiFi.localIP());
114 114 
         esp_info += "\"}";
115 115 
         String netinfo = "{\"Module\":\"";
116 116 
         netinfo += String (model);
117 
-        netinfo += "\", \"Version\":\"";
117 
+        netinfo += "\",\"Version\":\"";
118 118 
         netinfo += String (ver);
119 119 
         netinfo += "\"}";
120 120
... ... 
@@ -126,7 +126,7 @@ void reconectez() {
126 126 
         #if DEBUG
127 127 
         Serial.println(esp_info);
128 128 
         #endif
129 
-        client.publish(mqttESP, "15 minute",TRUE); // trimit intervalul default
129 
+        client.publish(mqttESP, "{\"LoopInterval\":\"15 minute\"}",TRUE); // trimit intervalul default
130 130 
         client.subscribe(mqttSUB);
131 131 
     } else {
132 132 
       #if DEBUG
arduino/nodemcu/senzor-dht/senzor-dht.ino
History View file @ d3ae377
... ... 
@@ -30,7 +30,7 @@ char mqttTEMP[23];
30 30 
 char mqttLWT[22];
31 31
32 32 
 const String model = "NodeMCU ";
33 
-const String ver = "v2.0.0";
33 
+const String ver = "v2.0.1";
34 34 
 const char* mqttServer = "mqtt.clickhome.ro";
35 35 
 const int mqttPort = 1883;
36 36 
 long loopTimer = 900000; // miliseconds - by default trimite la 15 minute
... ... 
@@ -124,14 +124,14 @@ void reconectez() {
124 124 
       // trimit informatii utile cand ma conectez
125 125 
         String esp_info = "{\"ESPMac\":\"";
126 126 
         esp_info += getMacAddress();
127 
-        esp_info += "\", \"IPAddress\":\"";
127 
+        esp_info += "\",\"IPAddress\":\"";
128 128 
         esp_info += ipToString(WiFi.localIP());
129 129 
         esp_info += "\"}";
130 130 
         String netinfo = "{\"Module\":\"";
131 131 
         netinfo += String (model);
132 132 
         netinfo += "DHT";
133 133 
         netinfo += String (DHTTYPE);
134 
-        netinfo += "\", \"Version\":\"";
134 
+        netinfo += "\",\"Version\":\"";
135 135 
         netinfo += String (ver);
136 136 
         netinfo += "\"}";
137 137
... ... 
@@ -143,7 +143,7 @@ void reconectez() {
143 143 
         #if DEBUG
144 144 
         Serial.println(esp_info);
145 145 
         #endif
146 
-        client.publish(mqttESP, "15 minute",TRUE); // trimit intervalul default
146 
+        client.publish(mqttESP, "{\"LoopInterval\":\"15 minute\"}",TRUE); // trimit intervalul default
147 147 
         client.subscribe(mqttSUB);
148 148 
     } else {
149 149 
       #if DEBUG
... ... 
@@ -215,7 +215,7 @@ void getMessage(char* topic, byte* payload, unsigned int length) {
215 215 
            delay(10);
216 216 
            String json = "{\"Temp\":";
217 217 
            json += String (t);
218 
-           json += ", \"Humi\":";
218 
+           json += ",\"Humi\":";
219 219 
            json += String (h);
220 220 
            json += "}";
221 221 
            client.publish(mqttTEMP, json.c_str(),TRUE);
... ... 
@@ -359,7 +359,7 @@ void loop()
359 359 
            delay(10);
360 360 
            String val = "{\"Temp\":";
361 361 
            val += String (loopTemp);
362 
-           val += ", \"Humi\":";
362 
+           val += ",\"Humi\":";
363 363 
            val += String (loopHumi);
364 364 
            val += "}";
365 365 
            client.publish(mqttESP, val.c_str(),TRUE);