DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sds011 more cleanups

Browse Source
This commit is contained in:
cyberman54 2022-02-16 00:47:17 +01:00
parent 9dc3f03b62
commit f8d3780b2c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sds011read.h
View File

@ -6,6 +6,14 @@
#define SDCARD_FILE_HEADER_SDS011 ", PM10,PM25" #define SDCARD_FILE_HEADER_SDS011 ", PM10,PM25"
// use original pins from HardwareSerial if none defined
#ifndef SDS_TX
#define SDS_TX -1
#endif
#ifndef SDS_RX
#define SDS_RX -1
#endif
extern bool isSDS011Active; extern bool isSDS011Active;
bool sds011_init(); bool sds011_init();
@ -13,5 +21,4 @@ void sds011_loop();
void sds011_sleep(void); void sds011_sleep(void);
void sds011_wakeup(void); void sds011_wakeup(void);
void sds011_store(sdsStatus_t *sds_store); void sds011_store(sdsStatus_t *sds_store);
#endif // _SDS011READ_H #endif // _SDS011READ_H

16
src/sds011read.cpp
View File

@ -13,16 +13,12 @@ static const char TAG[] = __FILE__;
SdsDustSensor sds(Serial2); SdsDustSensor sds(Serial2);
// the results of the sensor:
static float pm10, pm25;
bool isSDS011Active = false; bool isSDS011Active = false;
static float pm10 = 0.0, pm25 = 0.0;
// init // init
bool sds011_init() { bool sds011_init() {
pm25 = pm10 = 0.0; sds.begin(9600, SERIAL_8N1, SDS_RX, SDS_TX);
sds.begin(9600, SERIAL_8N1, 12, 35);
String version = sds.queryFirmwareVersion().toString(); String version = sds.queryFirmwareVersion().toString();
ESP_LOGI(TAG, "SDS011 firmware version %s", version); ESP_LOGI(TAG, "SDS011 firmware version %s", version);
sds.setQueryReportingMode(); sds.setQueryReportingMode();
@ -36,12 +32,12 @@ void sds011_loop() {
if (isSDS011Active) { if (isSDS011Active) {
PmResult pm = sds.queryPm(); PmResult pm = sds.queryPm();
if (!pm.isOk()) { if (!pm.isOk()) {
pm25 = pm10 = 0.0; ESP_LOGE(TAG, "SDS011 query error %s", pm.statusToString());
ESP_LOGE(TAG, "SDS011 query error"); pm10 = pm25 = 0.0;
} else { } else {
pm25 = pm.pm25; ESP_LOGI(TAG, "SDS011: %s", pm.toString());
pm10 = pm.pm10; pm10 = pm.pm10;
ESP_LOGI(TAG, "fine-dust-values: %5.1f,%4.1f", pm10, pm25); pm25 = pm.pm25;
} }
sds011_sleep(); sds011_sleep();
} }