-Changed getCO2 to return a char and if sensor is non existent will return NULL
-Changed getPM2 to return a char and if sensor is non existent will return NULL
-Added a new function getPM2_Raw which will return the value of PM2 as an integer
-Added a new function getCO2_Raw which will return the value of CO2 as an integer
-Added 2 new variables in the TMP_Raw Struct:
1. t_Char
2. rh_Char
These variables will be used to store the corresponding values as char and if sensor is nonexistent should be NULL
This commit is contained in:
Cristhian Macoh Musada
2020-07-25 14:28:18 +08:00
parent 3775be0034
commit e6d886c00e
9 changed files with 127 additions and 90 deletions

View File

@ -4,19 +4,18 @@ AirGradient ag = AirGradient();
void setup(){
Serial.begin(9600);
ag.PMS_Init();
ag.C02_Init();
ag.CO2_Init();
ag.TMP_RH_Init(0x44); //check for SHT sensor with address 0x44
}
void loop(){
int PM2 = ag.getPM2();
Serial.print("PM2: ");
Serial.println(PM2);
Serial.println(ag.getPM2());
int CO2 = ag.getC02();
Serial.print("C02: ");
Serial.println(CO2);
Serial.print("CO2: ");
Serial.println(ag.getCO2());
TMP_RH result = ag.periodicFetchData();
Serial.print("Humidity: ");

View File

@ -10,17 +10,17 @@ void setup(){
Serial.begin(9600);
display.begin(SSD1306_SWITCHCAPVCC, 0x3C);
ag.PMS_Init();
ag.C02_Init();
ag.CO2_Init();
ag.TMP_RH_Init(0x44); //check for SHT sensor with address 0x44
showTextRectangle("Init", String(ESP.getChipId(),HEX),"AirGradient");
delay(2000);
}
void loop(){
int PM2 = ag.getPM2();
int CO2 = ag.getC02();
int PM2 = ag.getPM2_Raw();
int CO2 = ag.getCO2_Raw();
TMP_RH result = ag.periodicFetchData();
showTextRectangle(String(result.t)+"c "+String(result.rh)+"%", "PM2: "+ String(PM2), "CO2: "+String(CO2)+"");
showTextRectangle(String(result.t)+"c "+String(result.rh)+"%", "PM2: "+ String(ag.getPM2()), "CO2: "+String(ag.getCO2())+"");
delay(5000);
}

View File

@ -15,7 +15,7 @@ void setup(){
Serial.begin(9600);
display.begin(SSD1306_SWITCHCAPVCC, 0x3C);
ag.PMS_Init();
ag.C02_Init();
ag.CO2_Init();
ag.TMP_RH_Init(0x44); //check for SHT sensor with address 0x44
showTextRectangle("Init", String(ESP.getChipId(),HEX),"AirGradient");
connectToWifi();
@ -23,13 +23,13 @@ void setup(){
}
void loop(){
int PM2 = ag.getPM2();
int CO2 = ag.getC02();
int PM2 = ag.getPM2_Raw();
int CO2 = ag.getCO2_Raw();
TMP_RH result = ag.periodicFetchData();
showTextRectangle(String(result.t)+"c "+String(result.rh)+"%", "PM2: "+ String(PM2), "CO2: "+String(CO2)+"");
// send payload
String payload = "{\"pm02\":" + String(PM2) + ",\"wifi\":" + String(WiFi.RSSI()) + ",\"rco2\":" + String(CO2) + ",\"atmp\":" + String(result.t) + ",\"rhum\":" + String(result.rh) + "}";
String payload = "{\"pm02\":" + String(ag.getPM2()) + ",\"wifi\":" + String(WiFi.RSSI()) + ",\"rco2\":" + String(ag.getCO2()) + ",\"atmp\":" + String(result.t) + ",\"rhum\":" + String(result.rh) + "}";
Serial.println(payload);
String POSTURL = APIROOT + "sensors/airgradient:" + String(ESP.getChipId(),HEX) + "/measures";
Serial.println(POSTURL);

View File

@ -3,14 +3,14 @@ AirGradient ag = AirGradient();
void setup(){
Serial.begin(9600);
ag.C02_Init();
ag.CO2_Init();
}
void loop(){
int CO2 = ag.getC02();
int CO2 = ag.getCO2_Raw();
Serial.print("C02: ");
Serial.println(CO2);
Serial.println(ag.getCO2());
delay(5000);
}
}

View File

@ -8,9 +8,9 @@ void setup(){
void loop(){
int PM2 = ag.getPM2();
int PM2 = ag.getPM2_Raw();
Serial.print("PM2: ");
Serial.println(PM2);
Serial.println(ag.getPM2());
delay(5000);
}
}

View File

@ -9,8 +9,8 @@ void setup(){
void loop(){
TMP_RH result = ag.periodicFetchData();
Serial.print("Humidity: ");
Serial.print(result.rh);
Serial.print(result.rh_char);
Serial.print(" Temperature: ");
Serial.println(result.t);
Serial.println(result.t_char);
delay(5000);
}