comparison: main/task_mqtt.c
main/task_mqtt.c
- changeset 2
- c0184362d48c
- parent 1
- 1082183cd6bb
- child 3
- cd760fd45271
equal
deleted
inserted
replaced
| 1:1082183cd6bb | 2:c0184362d48c |
|---|---|
| 106 | 106 |
| 107 // temperature_state temperature_address temperature | 107 // temperature_state temperature_address temperature |
| 108 payload = xstrcat(payload, (char *)"\",\"temperature\":{\"state\":\""); | 108 payload = xstrcat(payload, (char *)"\",\"temperature\":{\"state\":\""); |
| 109 payload = xstrcat(payload, (char *)sensState[units[i].temperature_state]); | 109 payload = xstrcat(payload, (char *)sensState[units[i].temperature_state]); |
| 110 payload = xstrcat(payload, (char *)"\",\"address\":\""); | 110 payload = xstrcat(payload, (char *)"\",\"address\":\""); |
| 111 payload = xstrcat(payload, (char *)units[i].temperature_address); | 111 payload = xstrcat(payload, (char *)units[i].temperature_rom_code); |
| 112 payload = xstrcat(payload, (char *)"\",\"temperature\":"); | 112 payload = xstrcat(payload, (char *)"\",\"temperature\":"); |
| 113 sprintf(buf, "%.3f", units[i].temperature / 1000.0); | 113 sprintf(buf, "%.3f", units[i].temperature / 1000.0); |
| 114 payload = xstrcat(payload, buf); | 114 payload = xstrcat(payload, buf); |
| 115 | 115 |
| 116 // pressure_state pressure_channel pressure_voltage pressure_zero pressure | 116 // pressure_state pressure_channel pressure_voltage pressure_zero pressure |
| 124 payload = xstrcat(payload, buf); | 124 payload = xstrcat(payload, buf); |
| 125 payload = xstrcat(payload, (char *)",\"zero\":"); | 125 payload = xstrcat(payload, (char *)",\"zero\":"); |
| 126 sprintf(buf, "%.3f", units[i].pressure_zero / 1000.0); | 126 sprintf(buf, "%.3f", units[i].pressure_zero / 1000.0); |
| 127 payload = xstrcat(payload, buf); | 127 payload = xstrcat(payload, buf); |
| 128 payload = xstrcat(payload, (char *)",\"bar\":"); | 128 payload = xstrcat(payload, (char *)",\"bar\":"); |
| 129 sprintf(buf, "%.3f", units[i].pressure / 1000.0); | 129 sprintf(buf, "%.2f", units[i].pressure / 1000.0); |
| 130 payload = xstrcat(payload, buf); | 130 payload = xstrcat(payload, buf); |
| 131 payload = xstrcat(payload, (char *)"},\"mode\":\""); | 131 payload = xstrcat(payload, (char *)"},\"mode\":\""); |
| 132 payload = xstrcat(payload, (char *)unitMode[units[i].mode]); | 132 payload = xstrcat(payload, (char *)unitMode[units[i].mode]); |
| 133 payload = xstrcat(payload, (char *)"\"}"); | 133 payload = xstrcat(payload, (char *)"\"}"); |
| 134 return payload; | 134 return payload; |
| 184 payload = xstrcat(payload, (char *)app_desc->version); | 184 payload = xstrcat(payload, (char *)app_desc->version); |
| 185 payload = xstrcat(payload, (char *)"\"}"); | 185 payload = xstrcat(payload, (char *)"\"}"); |
| 186 | 186 |
| 187 if (xSemaphoreTake(xSemaphoreDS18B20, 10) == pdTRUE) { | 187 if (xSemaphoreTake(xSemaphoreDS18B20, 10) == pdTRUE) { |
| 188 payload = xstrcat(payload, (char *)",\"THB\":{\"temperature\":"); | 188 payload = xstrcat(payload, (char *)",\"THB\":{\"temperature\":"); |
| 189 sprintf(buf, "%.3f", ds18b20_state->bottle_temperature); | 189 sprintf(buf, "%.3f", ds18b20_state->sensor[0].temperature); |
| 190 payload = xstrcat(payload, buf); | 190 payload = xstrcat(payload, buf); |
| 191 payload = xstrcat(payload, (char *)"}"); | 191 payload = xstrcat(payload, (char *)"}"); |
| 192 xSemaphoreGive(xSemaphoreDS18B20); | 192 xSemaphoreGive(xSemaphoreDS18B20); |
| 193 } | 193 } |
| 194 | 194 |
