Refactor includes

include/mgos_prometheus_sensors.h

@@ -1,10 +1,5 @@
-#ifndef __MGOS_PROMETHEUS_SENSORS_H
+#pragma once
-#define __MGOS_PROMETHEUS_SENSORS_H
 
 #include "mgos.h"
-#include "mgos_gpio.h"
+#include "mgos_config.h"
-
+#include "mgos_prometheus_metrics.h"
-float mgos_prometheus_sensors_dht_get_temp(uint8_t idx);
-float mgos_prometheus_sensors_dht_get_humidity(uint8_t idx);
-
-#endif                                  // __MGOS_PROMETHEUS_SENSORS_H

src/barometer_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_BAROMETER
 #include "mgos_barometer.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 #include <math.h>
 

src/bme280_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_BME280
 #include "mgos_bme280.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_bme280 *    s_bme280;

src/ccs811_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_CCS811_I2C
 #include "mgos_ccs811.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_ccs811 *s_ccs811;

src/dht_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_DHT
 #include "mgos_dht.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 #define MAX_DHT    8

src/htu21df_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_HTU21DF_I2C
 #include "mgos_htu21df.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_htu21df *s_htu21df;

src/mcp9808_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_MCP9808_I2C
 #include "mgos_mcp9808.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_mcp9808 *s_mcp9808;

src/mgos_prometheus_sensors.c

@@ -1,16 +1,4 @@
-#include "mgos_config.h"
+#include "mgos_prometheus_sensors_internal.h"
-#include "mgos_prometheus_metrics.h"
-#include "mgos_prometheus_sensors.h"
-
-void dht_drv_init();
-void veml6075_drv_init();
-void bme280_drv_init();
-void sht31_drv_init();
-void si7021_drv_init();
-void htu21df_drv_init();
-void mcp9808_drv_init();
-void ccs811_drv_init();
-void barometer_drv_init();
 
 static void pushgateway_timer(void *user_data) {
   mgos_prometheus_metrics_push(MGOS_APP, mgos_sys_config_get_device_id());

src/mgos_prometheus_sensors_internal.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "mgos.h"
+#include "mgos_prometheus_sensors.h"
+
+void dht_drv_init();
+void veml6075_drv_init();
+void bme280_drv_init();
+void sht31_drv_init();
+void si7021_drv_init();
+void htu21df_drv_init();
+void mcp9808_drv_init();
+void ccs811_drv_init();
+void barometer_drv_init();

src/sht31_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_SHT31_I2C
 #include "mgos_sht31.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_sht31 *s_sht31;

src/si7021_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_SI7021_I2C
 #include "mgos_si7021.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_si7021 *s_si7021;

src/veml6075_drv.c

@@ -2,8 +2,6 @@
 
 #ifdef MGOS_HAVE_VEML6075_I2C
 #include "mgos_veml6075.h"
-#include "mgos_config.h"
-#include "mgos_prometheus_metrics.h"
 #include "mgos_prometheus_sensors.h"
 
 static struct mgos_veml6075 *s_veml6075;