comparison: main/co2meter.c
main/co2meter.c
- changeset 74
- 34da2d2b12d5
- parent 59
- 52d9405474e1
- child 77
- 15dc572a7fcb
equal
deleted
inserted
replaced
| 73:c18d2951e8d7 | 74:34da2d2b12d5 |
|---|---|
| 228 units[i].alarm |= ALARM_UNIT_PRESSURE; | 228 units[i].alarm |= ALARM_UNIT_PRESSURE; |
| 229 int P = (units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero) * 14; // in bar | 229 int P = (units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero) * 14; // in bar |
| 230 if (P < 0) | 230 if (P < 0) |
| 231 P = 0; | 231 P = 0; |
| 232 units[i].pressure = P; | 232 units[i].pressure = P; |
| 233 ESP_LOGI(TAG, "%d vb:%.3f vp:%.3f zero:%d scale:%3d mbar:%4d alm: %d t:%6.3f %s", | 233 ESP_LOGI(TAG, "%d vb:%.3f vp:%.3f zero:%lu scale:%3lu mbar:%4d alm: %lu t:%6.3f %s", |
| 234 i, adc_state->Batt_voltage / 1000.0, units[i].pressure_voltage / 1000.0, units[i].pressure_zero, | 234 i, (adc_state->Batt_voltage / 1000.0), (units[i].pressure_voltage / 1000.0), units[i].pressure_zero, |
| 235 units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero, P, units[i].alarm, | 235 (units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero), P, units[i].alarm, |
| 236 units[i].temperature / 1000.0, units[i].temperature_rom_code); | 236 (double)(units[i].temperature / 1000.0), units[i].temperature_rom_code); |
| 237 xSemaphoreGive(xSemaphoreADC); | 237 xSemaphoreGive(xSemaphoreADC); |
| 238 } else { | 238 } else { |
| 239 ESP_LOGE(TAG, "ML1_MQTT_CONNECT ADC[%d] lock error", i); | 239 ESP_LOGE(TAG, "ML1_MQTT_CONNECT ADC[%d] lock error", i); |
| 240 } | 240 } |
| 241 xSemaphoreGive(xSemaphoreUnits); | 241 xSemaphoreGive(xSemaphoreUnits); |
