From 6fad4e2e79632bdc18539b8f910d6679294576b6 Mon Sep 17 00:00:00 2001 From: August Quint <49277349+AugustQu@users.noreply.github.com> Date: Tue, 21 Jan 2020 14:57:36 +0100 Subject: [PATCH 1/6] initial --- include/sds011read.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 include/sds011read.h diff --git a/include/sds011read.h b/include/sds011read.h new file mode 100644 index 00000000..734395a7 --- /dev/null +++ b/include/sds011read.h @@ -0,0 +1,15 @@ +#ifndef _SDS011READ_H +#define _SDS011READ_H + +#include + +// used pins on the ESP-side: +#define ESP_PIN_TX 19 // connect to RX on the SDS011 +#define ESP_PIN_RX 23 // connect to TX on the SDS011 + +#define SDCARD_FILE_HEADER_SDS011 ", PM10,PM25" + +bool sds011_init(); +void sds011_loop(); + +#endif // _SDS011READ_H From 83cf9ff23e877839ee334db44d87b775a05895cc Mon Sep 17 00:00:00 2001 From: August Quint <49277349+AugustQu@users.noreply.github.com> Date: Tue, 21 Jan 2020 14:58:55 +0100 Subject: [PATCH 2/6] plus modifications for SDS011 --- include/senddata.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/senddata.h b/include/senddata.h index 5022800c..324f2e1f 100644 --- a/include/senddata.h +++ b/include/senddata.h @@ -16,6 +16,10 @@ #include "sdcard.h" #endif +#if (HAS_SDS011) +#include "sds011read.h" +#endif + extern Ticker sendcycler; void SendPayload(uint8_t port, sendprio_t prio); From 966fd2d5abb306d4aaf680aa1d738ad9a00469e2 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Tue, 21 Jan 2020 22:47:22 +0100 Subject: [PATCH 3/6] Revert "Merge pull request #527 from AugustQu/patch-8" This reverts commit 1d152551bfca27cd78005a447ebc62e2cee5a30c, reversing changes made to db1d9e5720999cf549be4801db1548f2e1a00587. --- include/sds011read.h | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 include/sds011read.h diff --git a/include/sds011read.h b/include/sds011read.h deleted file mode 100644 index 734395a7..00000000 --- a/include/sds011read.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _SDS011READ_H -#define _SDS011READ_H - -#include - -// used pins on the ESP-side: -#define ESP_PIN_TX 19 // connect to RX on the SDS011 -#define ESP_PIN_RX 23 // connect to TX on the SDS011 - -#define SDCARD_FILE_HEADER_SDS011 ", PM10,PM25" - -bool sds011_init(); -void sds011_loop(); - -#endif // _SDS011READ_H From 4d2960ea10e8e2c5b08b4a29a61639d62749b7a3 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Tue, 21 Jan 2020 22:48:24 +0100 Subject: [PATCH 4/6] Revert "Merge pull request #526 from AugustQu/patch-9" This reverts commit db1d9e5720999cf549be4801db1548f2e1a00587, reversing changes made to 04850fd5c7bee55c8d972bb7a9c716ba13e6b4c1. --- include/senddata.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/senddata.h b/include/senddata.h index 324f2e1f..5022800c 100644 --- a/include/senddata.h +++ b/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);