Mercurial > co2meter / file diff

--- a/main/task_mqtt.c	Tue Oct 08 12:55:23 2019 +0200
+++ b/main/task_mqtt.c	Tue Oct 08 15:47:34 2019 +0200
@@ -108,7 +108,7 @@
     payload = xstrcat(payload, (char *)"\",\"temperature\":{\"state\":\"");
     payload = xstrcat(payload, (char *)sensState[units[i].temperature_state]);
     payload = xstrcat(payload, (char *)"\",\"address\":\"");
-    payload = xstrcat(payload, (char *)units[i].temperature_address);
+    payload = xstrcat(payload, (char *)units[i].temperature_rom_code);
     payload = xstrcat(payload, (char *)"\",\"temperature\":");
     sprintf(buf, "%.3f", units[i].temperature / 1000.0);
     payload = xstrcat(payload, buf);
@@ -126,7 +126,7 @@
     sprintf(buf, "%.3f", units[i].pressure_zero / 1000.0);
     payload = xstrcat(payload, buf);
     payload = xstrcat(payload, (char *)",\"bar\":");
-    sprintf(buf, "%.3f", units[i].pressure / 1000.0);
+    sprintf(buf, "%.2f", units[i].pressure / 1000.0);
     payload = xstrcat(payload, buf);
     payload = xstrcat(payload, (char *)"},\"mode\":\"");
     payload = xstrcat(payload, (char *)unitMode[units[i].mode]);
@@ -186,7 +186,7 @@
 
     if (xSemaphoreTake(xSemaphoreDS18B20, 10) == pdTRUE) {
         payload = xstrcat(payload, (char *)",\"THB\":{\"temperature\":");
-        sprintf(buf, "%.3f", ds18b20_state->bottle_temperature);
+        sprintf(buf, "%.3f", ds18b20_state->sensor[0].temperature);
         payload = xstrcat(payload, buf);
         payload = xstrcat(payload, (char *)"}");
 	xSemaphoreGive(xSemaphoreDS18B20);