BME280 integration (PR #309)

include/bme280.h

@@ -1,17 +0,0 @@
-#ifndef _BME280_H
-#define _BME280_H
-
-#include "globals.h"
-#include <Wire.h>
-#include <Adafruit_Sensor.h>
-#include <Adafruit_BME280.h>
-#include "../lib/Bosch-BSEC/src/bsec.h"
-
-extern bmeStatus_t
-    bme_status; // Make struct for storing gps data globally available
-extern TaskHandle_t Bme280Task;
-
-int bme280_init();
-void bme280_loop(void *pvParameters);
-
-#endif

include/bmesensor.h

@@ -1,9 +1,15 @@
-#ifndef _BME680MEMS_H
-#define _BME680MEMS_H
+#ifndef _BMESENSOR_H
+#define _BMESENSOR_H
 
 #include "globals.h"
 #include <Wire.h>
+
+#ifdef HAS_BME680
 #include "../lib/Bosch-BSEC/src/bsec.h"
+#elif defined HAS_BME280
+#include <Adafruit_Sensor.h>
+#include <Adafruit_BME280.h>
+#endif
 
 extern bmeStatus_t
     bme_status; // Make struct for storing gps data globally available

include/cyclic.h

@@ -7,12 +7,8 @@
 #include "spislave.h"
 #include <lmic.h>
 
-#ifdef HAS_BME680
-#include "bme680mems.h"
-#endif
-
-#ifdef HAS_BME280
-#include "bme280.h"
+#if (HAS_BME)
+#include "bmesensor.h"
 #endif
 
 extern Ticker housekeeper;

include/globals.h

@@ -151,12 +151,8 @@ extern time_t userUTCTime;
 #include "sensor.h"
 #endif
 
-#ifdef HAS_BME680
-#include "bme680mems.h"
-#endif
-
-#ifdef HAS_BME280
-#include "bme280.h"
+#if (HAS_BME)
+#include "bmesensor.h"
 #endif
 
 #endif