diff --git a/epicardium/main.c b/epicardium/main.c index 9cb5daa2c4b3e601338739deb42bc4e461cfb7be..fbefe0ac74025e3be3329bb948bcf2f8c8540e98 100644 --- a/epicardium/main.c +++ b/epicardium/main.c @@ -126,15 +126,17 @@ int main(void) } /* BSEC */ - if(bsec_activate() == 0) { + if (bsec_activate() == 0) { if (xTaskCreate( - vBSECTask, - (const char *)"BSEC", - configMINIMAL_STACK_SIZE * 3, - NULL, - tskIDLE_PRIORITY + 1, - NULL) != pdPASS) { - LOG_CRIT("startup", "Failed to create %s task!", "BSEC"); + vBSECTask, + (const char *)"BSEC", + configMINIMAL_STACK_SIZE * 3, + NULL, + tskIDLE_PRIORITY + 1, + NULL) != pdPASS) { + LOG_CRIT( + "startup", "Failed to create %s task!", "BSEC" + ); abort(); } } diff --git a/epicardium/modules/bme680.c b/epicardium/modules/bme680.c index fbdbcea7bd8e80a0d53843a1cb446b90b9df1fb3..8671559f8edfcd172627a5c32a343905686ed6a5 100644 --- a/epicardium/modules/bme680.c +++ b/epicardium/modules/bme680.c @@ -172,7 +172,7 @@ int epic_bme680_read_sensors(struct bme680_sensor_data *data) return -EINVAL; } - if(data == NULL) { + if (data == NULL) { return -EFAULT; } diff --git a/epicardium/modules/bsec.c b/epicardium/modules/bsec.c index 3230dbb79ec2bc8bb32c03c95cdcf0948cb0c94c..443d7a4b9165c598452ce7625054e9938a927db6 100644 --- a/epicardium/modules/bsec.c +++ b/epicardium/modules/bsec.c @@ -104,44 +104,44 @@ void output_ready( float co2_equivalent, float breath_voc_equivalent ) { - last_bsec_data.temperature = temperature; - last_bsec_data.humidity = humidity; - last_bsec_data.pressure = pressure / 100.; - last_bsec_data.gas_resistance = gas; - last_bsec_data.timestamp = timestamp; - last_bsec_data.accuracy = iaq_accuracy; - last_bsec_data.indoor_air_quality = iaq; + last_bsec_data.temperature = temperature; + last_bsec_data.humidity = humidity; + last_bsec_data.pressure = pressure / 100.; + last_bsec_data.gas_resistance = gas; + last_bsec_data.timestamp = timestamp; + last_bsec_data.accuracy = iaq_accuracy; + last_bsec_data.indoor_air_quality = iaq; last_bsec_data.static_indoor_air_quality = static_iaq; - last_bsec_data.co2_equivalent = co2_equivalent; - last_bsec_data.breath_voc_equivalent = breath_voc_equivalent; + last_bsec_data.co2_equivalent = co2_equivalent; + last_bsec_data.breath_voc_equivalent = breath_voc_equivalent; __sync_synchronize(); - last_bme680_timestamp = timestamp; + last_bme680_timestamp = timestamp; - if(debug) { + if (debug) { printf("BSEC time[ms]: %u, IAQ: %u, IAQ ACC[0-3]: %u, T[.1C]: %u, Hum[.1%%]: %u, P[Pa]: %u, Raw T[.1C]: %u, Raw Hum[.1%%]: %u, Gas[Ohm]: %u, Static IAQ: %u, CO2[ppm]: %u, Breath VOC[ppb]: %u\n", - (unsigned int)(timestamp / 1e6), - (unsigned int)(iaq), - (unsigned int)(iaq_accuracy), - (unsigned int)(temperature * 10), - (unsigned int)(humidity * 10), - (unsigned int)(pressure), - (unsigned int)(raw_temperature * 10), - (unsigned int)(raw_humidity * 10), - (unsigned int)(gas), - (unsigned int)(static_iaq), - (unsigned int)(co2_equivalent), - (unsigned int)(breath_voc_equivalent * 1e3)); + (unsigned int)(timestamp / 1e6), + (unsigned int)(iaq), + (unsigned int)(iaq_accuracy), + (unsigned int)(temperature * 10), + (unsigned int)(humidity * 10), + (unsigned int)(pressure), + (unsigned int)(raw_temperature * 10), + (unsigned int)(raw_humidity * 10), + (unsigned int)(gas), + (unsigned int)(static_iaq), + (unsigned int)(co2_equivalent), + (unsigned int)(breath_voc_equivalent * 1e3)); } } int epic_bsec_read_sensors(struct bsec_sensor_data *data) { - if(data == NULL) { + if (data == NULL) { return -EFAULT; } - if(!bsec_task_active) { + if (!bsec_task_active) { return -ENODEV; } @@ -333,16 +333,16 @@ int bsec_read_bme680(struct bme680_sensor_data *data) return BME680_E_COM_FAIL; } - if(data == NULL) { + if (data == NULL) { return -EFAULT; } while (last_bme680_timestamp == 0) vTaskDelay(pdMS_TO_TICKS(10)); - data->temperature = last_bsec_data.temperature; - data->humidity = last_bsec_data.humidity; - data->pressure = last_bsec_data.pressure; + data->temperature = last_bsec_data.temperature; + data->humidity = last_bsec_data.humidity; + data->pressure = last_bsec_data.pressure; data->gas_resistance = last_bsec_data.gas_resistance; return BME680_OK; @@ -365,8 +365,9 @@ int bsec_activate(void) float temperature_offset = 0.0; - bool bsec_enabled = config_get_boolean_with_default("bsec_enabled", false); - if(!bsec_enabled) { + bool bsec_enabled = + config_get_boolean_with_default("bsec_enabled", false); + if (!bsec_enabled) { return -1; }