Mercurial > co2meter / file diff

--- a/main/co2meter.c	Tue Nov 12 21:57:40 2019 +0100
+++ b/main/co2meter.c	Sun Nov 17 12:58:39 2019 +0100
@@ -14,6 +14,7 @@
 time_t                          	now;                            ///< Current time
 struct tm                       	timeinfo;                       ///< Current time structure
 char                            	strftime_buf[64];               ///< Time buffer
+int					num_sensors = 0;		///< Detected DS18B20 sensors
 static RTC_DATA_ATTR struct timeval	sleep_enter_time;
 static TaskHandle_t			xTaskDS18B20 = NULL;
 static TaskHandle_t			xTaskADC = NULL;
@@ -189,7 +190,7 @@
 			ESP_LOGI(TAG, "Loop timer: Wait MQTT");
 
 			uint32_t temp[DS18B20_MAX];
-			int state[DS18B20_MAX], i, num_sensors = 0;
+			int state[DS18B20_MAX], i;
 			char rom_code[DS18B20_MAX][17];
 			for (i = 0; i < DS18B20_MAX; i++) {
 			    temp[i] = 0;
@@ -197,6 +198,7 @@
 			    rom_code[i][0] = '\0';
 			}
 			/* Copy results from all connected DS18B20 sensors */
+			num_sensors = 0;
 			if (xSemaphoreTake(xSemaphoreDS18B20, 10) == pdTRUE) {
 			    num_sensors = ds18b20_state->num_sensors;
 			    for (i = 0; i < num_sensors; i++) {
@@ -236,10 +238,10 @@
 				    if (P < 0)
 				    	P = 0;
 				    units[i].pressure = P;
-printf("%d volt: %d batt: %d scale: %d  mbar: %d\n", i, units[i].pressure_voltage, adc_state->Batt_voltage, 
-		units[i].pressure_voltage / (adc_state->Batt_voltage / 1000) - units[i].pressure_zero, P);
-// Verbruik 10 mA
-// Setup tijd max 2 mS
+				    ESP_LOGI(TAG, "%d vb:%.3f vp:%.3f zero:%d scale:%3d mbar:%4d 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].temperature / 1000.0, units[i].temperature_rom_code);
 				    xSemaphoreGive(xSemaphoreADC);
 			    	} else {
 				    ESP_LOGE(TAG, "ML1_MQTT_CONNECT ADC[%d] lock error", i);