Skip to content

turnOn fix for newer SDS011, and set rx and txpin in constructor #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bwack wants to merge 2 commits into
base: master
Choose a base branch
from
Open

turnOn fix for newer SDS011, and set rx and txpin in constructor #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4e8df9
turnOn fix for newer SDS011 sensors
bwack Jan 20, 2019
f447bea
Dynamically set rx and txpin of SoftwareSerial
bwack Jan 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions src/hackair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@
#include "Arduino.h"
#include "hackair.h"

SoftwareSerial _serial(PIN_SERIAL_RX, PIN_SERIAL_TX);

/* Constructors */

hackAIR::hackAIR(int sensorType, int rxpin, int txpin) {
_rxPin = rxpin;
_txPin = txpin;
_sensorType = sensorType;
}

hackAIR::hackAIR(int sensorType) {
// Initialize last reading
_sensorType = sensorType;
Expand All @@ -35,7 +41,8 @@ hackAIR::hackAIR(int sensorType) {
void hackAIR::begin() {
if (_sensorType == SENSOR_DFROBOT || _sensorType == SENSOR_SDS011 || _sensorType == SENSOR_PMS5003) {
// Serial sensors just need a software serial port
_serial.begin(9600);
_serial = new SoftwareSerial(_rxPin,_txPin);
_serial->begin(9600);
} else if (_sensorType == SENSOR_GROVE) {
pinMode(8, INPUT);
}
Expand All @@ -45,11 +52,11 @@ void hackAIR::readData(hackAirData &data) {
if (_sensorType == SENSOR_DFROBOT) {
// DFRobot
char index = 0;
while (_serial.available() && index != 32) {
_buff[index] = _serial.read();
while (_serial->available() && index != 32) {
_buff[index] = _serial->read();
index++;
}
while (_serial.read() != -1) {}
while (_serial->read() != -1) {}

// Check the package integrity
if (_buff[0] == 0x42 && _buff[1] == 0x4d) {
Expand Down Expand Up @@ -87,11 +94,11 @@ void hackAIR::readData(hackAirData &data) {
} else if (_sensorType == SENSOR_SDS011) {
// SDS011
char index = 0;
while (_serial.available() && index != 10) {
_buff[index] = _serial.read();
while (_serial->available() && index != 10) {
_buff[index] = _serial->read();
index++;
}
while (_serial.read() != -1) {}
while (_serial->read() != -1) {}

// Check package integrity
if (_buff[0] == 0xAA && _buff[1] == 0xC0 && _buff[9] == 0xAB) {
Expand Down Expand Up @@ -134,6 +141,9 @@ void hackAIR::readData(hackAirData &data) {
data.error = 1;
}




void hackAIR::readAverageData(hackAirData &data, uint8_t n) {
float sum_pm25 = 0.0f;
float sum_pm10 = 0.0f;
Expand Down Expand Up @@ -181,9 +191,15 @@ void hackAIR::enablePowerControl() {
void hackAIR::turnOn() {
// SDS011 uses the built-in power saving function
if (_sensorType == SENSOR_SDS011) {
// Send anything to wake up the sensor
_serial.write(0x01);
delay(2000);
// Send wake-up command to wake up the sensor
uint8_t wakeup_command[] = {0xAA, 0xB4, 0x06, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x60, 0x09, 0xAB};
for (uint8_t i = 0; i < 19; i++) {
_serial->write(wakeup_command[i]);
}
// Discard response
_serial->flush();
while (_serial->read() != -1) {}
delay(500);
} else {
#ifndef ESP8266
digitalWrite(A2, HIGH);
Expand All @@ -197,12 +213,12 @@ void hackAIR::turnOff() {
// Send sleep command
uint8_t sleep_command[] = {0xAA, 0xB4, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x05, 0xAB};
for (uint8_t i = 0; i < 19; i++) {
_serial.write(sleep_command[i]);
_serial->write(sleep_command[i]);
}

// Discard response
_serial.flush();
while (_serial.read() != -1) {}
_serial->flush();
while (_serial->read() != -1) {}
} else {
#ifndef ESP8266
digitalWrite(A2, LOW);
Expand Down
4 changes: 4 additions & 0 deletions src/hackair.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class hackAIR {
public:
// Constructors
hackAIR(int sensor);
hackAIR(int sensor, int _rxpin, int _txpin);

/**
* Initialize the sensor (pin modes, buses, etc)
Expand Down Expand Up @@ -104,7 +105,10 @@ class hackAIR {
void humidityCompensation(hackAirData &data, float humidity);

private:
SoftwareSerial* _serial;
int _sensorType;
int _rxPin = PIN_SERIAL_RX;
int _txPin = PIN_SERIAL_TX;
long _lastTime;
long _pulseDuration;
unsigned char _buff[32];
Expand Down