pim/prometheus-sensors
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Uncrustify

Browse Source
This commit is contained in:
Pim van Pelt
2018-11-18 23:49:33 +01:00
parent 075dca9f0e
commit c9ff9775b8
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/barometer_drv.c
View File

@ -79,8 +79,11 @@ static void barometer_timer_cb(void *user_data) {
static struct mgos_barometer *barometer_create(struct mgos_i2c *i2c, uint8_t i2caddr, enum mgos_barometer_type type) { static struct mgos_barometer *barometer_create(struct mgos_i2c *i2c, uint8_t i2caddr, enum mgos_barometer_type type) {
struct mgos_barometer *b; struct mgos_barometer *b;
b = mgos_barometer_create_i2c(i2c, i2caddr, type); b = mgos_barometer_create_i2c(i2c, i2caddr, type);
if (!b) return NULL; if (!b) {
return NULL;
}
mgos_barometer_set_cache_ttl(b, 1000); mgos_barometer_set_cache_ttl(b, 1000);
mgos_set_timer(mgos_sys_config_get_sensors_barometer_period() * 1000, true, barometer_timer_cb, b); mgos_set_timer(mgos_sys_config_get_sensors_barometer_period() * 1000, true, barometer_timer_cb, b);
return b; return b;
@ -89,21 +92,26 @@ static struct mgos_barometer *barometer_create(struct mgos_i2c *i2c, uint8_t i2c
void barometer_drv_init() { void barometer_drv_init() {
int num_baro = 0; int num_baro = 0;
if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x76, BARO_BME280))) if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x76, BARO_BME280))) {
num_baro++; num_baro++;
}
if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x60, BARO_MPL115))) if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x60, BARO_MPL115))) {
num_baro++; num_baro++;
}
if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x60, BARO_MPL3115))) if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x60, BARO_MPL3115))) {
num_baro++; num_baro++;
}
if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x77, BARO_MS5611))) if ((s_barometer[num_baro] = barometer_create(mgos_i2c_get_global(), 0x77, BARO_MS5611))) {
num_baro++; num_baro++;
}
if (num_baro>0) if (num_baro > 0) {
mgos_prometheus_metrics_add_handler(barometer_prometheus_metrics, NULL); mgos_prometheus_metrics_add_handler(barometer_prometheus_metrics, NULL);
} }
}
#else #else
void barometer_drv_init() { void barometer_drv_init() {