Mercurial > mbsePi-apps / file diff

--- a/thermferm/mqtt.c	Wed Apr 24 21:58:27 2024 +0200
+++ b/thermferm/mqtt.c	Thu Apr 25 14:26:47 2024 +0200
@@ -951,6 +951,10 @@
     if (unit->beer_address) {
 	payload = xstrcat(payload, (char *)",\"beer\":{\"address\":\"");
 	payload = xstrcat(payload, unit->beer_address);
+	if (unit->beer_address2) {
+	    payload = xstrcat(payload, (char *)"\",\"address2\":\"");
+	    payload = xstrcat(payload, unit->beer_address2);
+	}
 	payload = xstrcat(payload, (char *)"\",\"state\":\"");
 	payload = xstrcat(payload, (char *)DEVPRESENT[unit->beer_state]);
         payload = xstrcat(payload, (char *)"\",\"temperature\":");
@@ -1519,7 +1523,7 @@
 	    payload = xstrcat(payload, (char *)"\",\"state\":\"");
 	    payload = xstrcat(payload, (char *)DEVPRESENT[Config.temp_state]);
 	    payload = xstrcat(payload, (char *)"\",\"value\":");
-            sprintf(buf, "%d", Config.temp_value);
+            sprintf(buf, "%.1f", Config.temp_value / 1000.0);
             payload = xstrcat(payload, buf);
 	    payload = xstrcat(payload, (char *)"}");
         }
@@ -1531,7 +1535,7 @@
             payload = xstrcat(payload, (char *)"\",\"state\":\"");
             payload = xstrcat(payload, (char *)DEVPRESENT[Config.hum_state]);
             payload = xstrcat(payload, (char *)"\",\"value\":");
-            sprintf(buf, "%d", Config.hum_value);
+            sprintf(buf, "%.1f", Config.hum_value / 1000.0);
             payload = xstrcat(payload, buf);
 	    payload = xstrcat(payload, (char *)"}");
         }
@@ -1653,14 +1657,14 @@
 	payload = xstrcat(payload, (char *)"\"THB\":{");
 	if (Config.temp_uuid) {
 	    payload = xstrcat(payload, (char *)"\"temperature\":");
-	    sprintf(buf, "%d", Config.temp_value);
+	    sprintf(buf, "%.1f", Config.temp_value / 1000.0);
 	    payload = xstrcat(payload, buf);
 	}
 	if (Config.temp_uuid && Config.hum_uuid)
 	    payload = xstrcat(payload, (char *)",");
 	if (Config.hum_uuid) {
 	    payload = xstrcat(payload, (char *)"\"humidity\":");
-	    sprintf(buf, "%d", Config.hum_value);
+	    sprintf(buf, "%.1f", Config.hum_value / 1000.0);
 	    payload = xstrcat(payload, buf);
 	}
 	payload = xstrcat(payload, (char *)"}");