comparison: main/co2meter.c
main/co2meter.c
- changeset 9
- a85995941d0d
- parent 8
- c6bbd1380f22
- child 11
- e33f2d325d15
equal
deleted
inserted
replaced
| 8:c6bbd1380f22 | 9:a85995941d0d |
|---|---|
| 264 int state = 0; | 264 int state = 0; |
| 265 char rom_code[17]; | 265 char rom_code[17]; |
| 266 if (xSemaphoreTake(xSemaphoreDS18B20, 10) == pdTRUE) { | 266 if (xSemaphoreTake(xSemaphoreDS18B20, 10) == pdTRUE) { |
| 267 temp = (ds18b20_state->sensor[0].temperature * 1000); | 267 temp = (ds18b20_state->sensor[0].temperature * 1000); |
| 268 state = (ds18b20_state->sensor[0].error == 0) ? 0:1; | 268 state = (ds18b20_state->sensor[0].error == 0) ? 0:1; |
| 269 strncpy(rom_code, ds18b20_state->sensor[0].rom_code, strlen(ds18b20_state->sensor[0].rom_code)); | 269 strncpy(rom_code, ds18b20_state->sensor[0].rom_code, 17); |
| 270 rom_code[16] = '\0'; | |
| 270 xSemaphoreGive(xSemaphoreDS18B20); | 271 xSemaphoreGive(xSemaphoreDS18B20); |
| 271 } | 272 } |
| 272 | 273 |
| 273 u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf); | 274 u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf); |
| 274 sprintf(buf, "%.1f °C", temp / 1000.0); | 275 sprintf(buf, "%.1f °C", temp / 1000.0); |
| 324 | 325 |
| 325 case MAIN_LOOP1_SEND: | 326 case MAIN_LOOP1_SEND: |
| 326 ESP_LOGI(TAG, "Loop timer: Send MQTT"); | 327 ESP_LOGI(TAG, "Loop timer: Send MQTT"); |
| 327 publishNode(); | 328 publishNode(); |
| 328 publishUnits(); | 329 publishUnits(); |
| 330 publishLogs(); | |
| 329 | 331 |
| 330 Main_Loop1 = MAIN_LOOP1_MQTT_DISCONNECT; | 332 Main_Loop1 = MAIN_LOOP1_MQTT_DISCONNECT; |
| 331 break; | 333 break; |
| 332 | 334 |
| 333 case MAIN_LOOP1_WAITACK: | 335 case MAIN_LOOP1_WAITACK: |
