Merge pull request #544 from cyberman54/master

sync sds011 with master

include/bmesensor.h

@@ -5,7 +5,7 @@
 #include <Wire.h>
 
 #ifdef HAS_BME680
-#include "../lib/Bosch-BSEC/src/bsec.h"
+#include <bsec.h>
 #elif defined HAS_BME280
 #include <Adafruit_Sensor.h>
 #include <Adafruit_BME280.h>

include/display.h

@@ -9,7 +9,7 @@ extern uint8_t DisplayIsOn, displaybuf[];
 void refreshTheDisplay(bool nextPage = false);
 void init_display(bool verbose = false);
 void shutdown_display(void);
-void draw_page(time_t t, uint8_t page);
+void draw_page(time_t t, bool nextpage);
 void dp_printf(uint16_t x, uint16_t y, uint8_t font, uint8_t inv,
                const char *format, ...);
 void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message);

include/globals.h

@@ -15,7 +15,7 @@
 #include <array>
 #include <algorithm>
 #include "mallocator.h"
-#include "../lib/Bosch-BSEC/src/inc/bsec_datatypes.h"
+#include <bsec.h>
 
 // sniffing types
 #define MAC_SNIFF_WIFI 0

include/senddata.h

@@ -16,10 +16,6 @@
 #include "sdcard.h"
 #endif
 
-#if (HAS_SDS011)
-#include "sds011read.h"
-#endif
-
 extern Ticker sendcycler;
 
 void SendPayload(uint8_t port, sendprio_t prio);

include/spislave.h

@@ -28,6 +28,8 @@ licenses. Refer to LICENSE.txt file in repository for more details.
 
 esp_err_t spi_init();
 
+extern TaskHandle_t spiTask;
+
 void spi_enqueuedata(MessageBuffer_t *message);
 void spi_queuereset();