mirror of
https://github.com/airgradienthq/arduino.git
synced 2025-07-30 17:07:16 +02:00
Fixed humidity reading
This commit is contained in:
@ -187,7 +187,7 @@ int AirGradient::getAMB_TMP(){
|
|||||||
DATA data;
|
DATA data;
|
||||||
requestRead();
|
requestRead();
|
||||||
if (readUntil(data)) {
|
if (readUntil(data)) {
|
||||||
count = data.AMB_TMP;
|
count = data.PM_TMP;
|
||||||
return count;
|
return count;
|
||||||
} else {
|
} else {
|
||||||
return -1;
|
return -1;
|
||||||
@ -199,7 +199,7 @@ int AirGradient::getAMB_HUM(){
|
|||||||
DATA data;
|
DATA data;
|
||||||
requestRead();
|
requestRead();
|
||||||
if (readUntil(data)) {
|
if (readUntil(data)) {
|
||||||
count = data.AMB_HUM;
|
count = data.PM_HUM;
|
||||||
return count;
|
return count;
|
||||||
} else {
|
} else {
|
||||||
return -1;
|
return -1;
|
||||||
@ -358,8 +358,8 @@ void AirGradient::loop()
|
|||||||
_data->AMB_HCHO = makeWord(_payload[24], _payload[25]) / 1000;
|
_data->AMB_HCHO = makeWord(_payload[24], _payload[25]) / 1000;
|
||||||
|
|
||||||
// Temperature & humidity (PMSxxxxST units only)
|
// Temperature & humidity (PMSxxxxST units only)
|
||||||
_data->AMB_TMP = makeWord(_payload[26], _payload[27]) / 10;
|
_data->PM_TMP = makeWord(_payload[20], _payload[21]) / 10;
|
||||||
_data->AMB_HUM = makeWord(_payload[28], _payload[29]) / 10;
|
_data->PM_HUM = makeWord(_payload[22], _payload[23]) / 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
_index = 0;
|
_index = 0;
|
||||||
|
@ -199,8 +199,8 @@ class AirGradient
|
|||||||
uint16_t AMB_HCHO;
|
uint16_t AMB_HCHO;
|
||||||
|
|
||||||
// Temperature & humidity - PMSxxxxST units only
|
// Temperature & humidity - PMSxxxxST units only
|
||||||
int16_t AMB_TMP;
|
int16_t PM_TMP;
|
||||||
uint16_t AMB_HUM;
|
uint16_t PM_HUM;
|
||||||
};
|
};
|
||||||
|
|
||||||
void PMS(Stream&);
|
void PMS(Stream&);
|
||||||
@ -278,7 +278,7 @@ class AirGradient
|
|||||||
enum STATUS { STATUS_WAITING, STATUS_OK };
|
enum STATUS { STATUS_WAITING, STATUS_OK };
|
||||||
enum MODE { MODE_ACTIVE, MODE_PASSIVE };
|
enum MODE { MODE_ACTIVE, MODE_PASSIVE };
|
||||||
|
|
||||||
uint8_t _payload[30];
|
uint8_t _payload[32];
|
||||||
Stream* _stream;
|
Stream* _stream;
|
||||||
DATA* _data;
|
DATA* _data;
|
||||||
STATUS _PMSstatus;
|
STATUS _PMSstatus;
|
||||||
@ -290,7 +290,9 @@ class AirGradient
|
|||||||
uint16_t _calculatedChecksum;
|
uint16_t _calculatedChecksum;
|
||||||
SoftwareSerial *_SoftSerial_PMS;
|
SoftwareSerial *_SoftSerial_PMS;
|
||||||
void loop();
|
void loop();
|
||||||
|
char Char_PM1[10];
|
||||||
char Char_PM2[10];
|
char Char_PM2[10];
|
||||||
|
char Char_PM10[10];
|
||||||
//PMS VARIABLES PRIVATE END
|
//PMS VARIABLES PRIVATE END
|
||||||
|
|
||||||
//TMP_RH VARIABLES PRIVATE START
|
//TMP_RH VARIABLES PRIVATE START
|
||||||
|
Reference in New Issue
Block a user