Merge branch 'SDS011' into SDS011

include/globals.h

@@ -111,6 +111,11 @@ typedef struct {
   float gas;             // raw gas sensor signal
 } bmeStatus_t;
 
+typedef struct {
+  float pm10;
+  float pm25;
+} sdsStatus_t;
+
 extern std::set<uint16_t, std::less<uint16_t>, Mallocator<uint16_t>> macs;
 extern std::array<uint64_t, 0xff>::iterator it;
 extern std::array<uint64_t, 0xff> beacons;

include/lorawan.h

@@ -49,7 +49,7 @@ void IRAM_ATTR myRxCallback(void *pUserData, uint8_t port,
 void IRAM_ATTR myTxCallback(void *pUserData, int fSuccess);
 void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, const mac_t table[],
                 const uint8_t tablesize);
-uint8_t getBattLevel(void);
+//u1_t os_getBattLevel(void);
 const char *getSfName(rps_t rps);
 const char *getBwName(rps_t rps);
 const char *getCrName(rps_t rps);

include/sds011read.h

@@ -1,6 +1,7 @@
 #ifndef _SDS011READ_H
 #define _SDS011READ_H
 
+#include "globals.h"
 #include <SDS011.h>
 
 #define SDCARD_FILE_HEADER_SDS011     ", PM10,PM25"
@@ -9,5 +10,6 @@ bool sds011_init();
 void sds011_loop();
 void sds011_sleep(void);
 void sds011_wakeup(void);
+void sds011_store(sdsStatus_t *sds_store);
 
 #endif // _SDS011READ_H