diff -r e2a43e7c4035 -r 358bbd5b608e main/co2meter.c --- a/main/co2meter.c Sat Nov 23 19:10:05 2019 +0100 +++ b/main/co2meter.c Sat Nov 23 21:43:14 2019 +0100 @@ -162,14 +162,12 @@ */ while (1) { - ESP_LOGI(TAG, "Entered app loop"); + ESP_LOGI(TAG, "Entered Main loop"); /* Measure process */ while (1) { switch (Main_Loop1) { case ML1_INIT: - ESP_LOGI(TAG, "Loop timer: Init"); - // If configured do ML1_CONNECT Main_Loop1 = ML1_CONNECT; requestWiFi_system(true); request_ds18b20(); @@ -187,7 +185,6 @@ if (ready_ds18b20() && ready_adc()) { connect_mqtt(true); Main_Loop1 = ML1_WAITCON; - ESP_LOGI(TAG, "Loop timer: Wait MQTT"); uint32_t temp[DS18B20_MAX]; int state[DS18B20_MAX], i; @@ -238,9 +235,9 @@ if (P < 0) P = 0; units[i].pressure = P; - ESP_LOGI(TAG, "%d vb:%.3f vp:%.3f zero:%d scale:%3d mbar:%4d t:%6.3f %s", + ESP_LOGI(TAG, "%d vb:%.3f vp:%.3f zero:%d scale:%3d mbar:%4d alm: %d t:%6.3f %s", i, adc_state->Batt_voltage / 1000.0, units[i].pressure_voltage / 1000.0, units[i].pressure_zero, - units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero, P, + units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero, P, units[i].alarm, units[i].temperature / 1000.0, units[i].temperature_rom_code); xSemaphoreGive(xSemaphoreADC); } else { @@ -267,7 +264,6 @@ break; case ML1_SEND: - ESP_LOGI(TAG, "Loop timer: Send MQTT"); publishNode(); publishUnits(); publishLogs(); @@ -280,14 +276,12 @@ break; case ML1_MQTT_DISCONNECT: - ESP_LOGI(TAG, "Loop timer: Disconnect MQTT"); connect_mqtt(false); // Doesn't really disconnect. Main_Loop1 = ML1_DISCONNECT; break; case ML1_DISCONNECT: if (! ready_mqtt()) { - ESP_LOGI(TAG, "Loop timer: WiFi off"); requestWiFi_system(false); Main_Loop1 = ML1_WIFI_OFF; } @@ -295,7 +289,7 @@ case ML1_WIFI_OFF: if (! ready_WiFi()) { - ESP_LOGI(TAG, "Loop timer: Done %s", user_busy() ? "true":"false"); + ESP_LOGI(TAG, "Main loop: Done, user busy: %s", user_busy() ? "true":"false"); Main_Loop1 = ML1_DONE; user_refresh(); }