airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-13 07:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

add nox_index to payload

Browse Source
This commit is contained in:
Phat Nguyen
2024-03-03 22:24:58 +07:00
parent 3f1da6387b
commit 6cf5e31843
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/ONE/ONE.ino
View File

@ -669,6 +669,7 @@ static int dispSmState = APP_SM_NORMAL; /** Save LED SM */
static int tvocIndex = -1;
static int tvocRawIndex = -1;
static int noxIndex = -1;
static int noxRawIndex = -1;
static int co2Ppm = -1;
static int pm25 = -1;
static int pm01 = -1;
@ -736,7 +737,7 @@ void setup() {
u8g2.begin();
/** Show boot display */
Serial.println("Firmware Version: "+ag.getVersion());
Serial.println("Firmware Version: " + ag.getVersion());
displayShowText("One V9", "FW Ver: " + ag.getVersion(), "");
delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
@ -1016,7 +1017,7 @@ void webServerMetricsGet(void) {
add_metric_point("", String(tvocIndex));
}
if (tvocRawIndex >= 0) {
add_metric("tvoc_raw_index",
add_metric("tvoc_raw",
"The raw input value to the Total Volatile Organic Compounds "
"(TVOC) index as measured by the AirGradient SGP sensor",
"gauge");
@ -1029,6 +1030,13 @@ void webServerMetricsGet(void) {
"gauge");
add_metric_point("", String(noxIndex));
}
if (noxRawIndex >= 0) {
add_metric("nox_raw",
"The raw input value to the Nitrous Oxide (NOx) index as "
"measured by the AirGradient SGP sensor",
"gauge");
add_metric_point("", String(noxRawIndex));
}
}
if (hasSensorSHT) {
@ -1118,6 +1126,9 @@ static String getServerSyncData(bool localServer) {
if (noxIndex >= 0) {
root["nox_index"] = noxIndex;
}
if(noxRawIndex >= 0) {
root["nox_raw"] = noxRawIndex;
}
}
if (hasSensorSHT) {
if (temp > -1001) {
@ -2179,11 +2190,13 @@ static void tvocUpdate(void) {
tvocIndex = ag.sgp41.getTvocIndex();
tvocRawIndex = ag.sgp41.getTvocRaw();
noxIndex = ag.sgp41.getNoxIndex();
noxRawIndex = ag.sgp41.getNoxRaw();
Serial.println();
Serial.printf(" TVOC index: %d\r\n", tvocIndex);
Serial.printf("TVOC raw index: %d\r\n", tvocRawIndex);
Serial.printf(" NOx index: %d\r\n", noxIndex);
Serial.printf(" NOx raw index: %d\r\n", noxRawIndex);
}
/**

6
examples/Open_Air/Open_Air.ino
View File

@ -666,6 +666,7 @@ WebServer webServer;
int tvocIndex = -1;
int tvocRawIndex = -1;
int noxIndex = -1;
int noxRawIndex = -1;
int co2Ppm = 0;
int pm25_1 = -1;
@ -1019,11 +1020,13 @@ static void tvocUpdate(void) {
tvocIndex = ag.sgp41.getTvocIndex();
tvocRawIndex = ag.sgp41.getTvocRaw();
noxIndex = ag.sgp41.getNoxIndex();
noxRawIndex = ag.sgp41.getNoxRaw();
Serial.println();
Serial.printf(" TVOC index: %d\r\n", tvocIndex);
Serial.printf("TVOC raw index: %d\r\n", tvocRawIndex);
Serial.printf(" NOx index: %d\r\n", noxIndex);
Serial.printf(" NOx raw index: %d\r\n", noxRawIndex);
}
/**
@ -1412,6 +1415,9 @@ static String getServerSyncData(bool localServer) {
if (noxIndex >= 0) {
root["nox_index"] = noxIndex;
}
if(noxRawIndex >= 0) {
root["nox_raw"] = noxRawIndex;
}
}
}

8
src/Sgp41/Sgp41.cpp
View File

@ -121,6 +121,7 @@ void Sgp41::_handle(void) {
vTaskDelay(pdMS_TO_TICKS(1000));
if (getRawSignal(srawVoc, srawNox)) {
tvocRaw = srawVoc;
noxRaw = srawNox;
nox = noxAlgorithm()->process(srawNox);
tvoc = vocAlgorithm()->process(srawVoc);
AgLog("Polling SGP41 success: tvoc: %d, nox: %d", tvoc, nox);
@ -249,3 +250,10 @@ bool Sgp41::_noxConditioning(void) {
* @return int
*/
int Sgp41::getTvocRaw(void) { return tvocRaw; }
/**
* @brief Get NOX raw value
*
* @return int
*/
int Sgp41::getNoxRaw(void) { return noxRaw; }

2
src/Sgp41/Sgp41.h
View File

@ -24,6 +24,7 @@ public:
int getTvocIndex(void);
int getNoxIndex(void);
int getTvocRaw(void);
int getNoxRaw(void);
private:
bool onConditioning = true;
@ -39,6 +40,7 @@ private:
int tvoc = 0;
int tvocRaw;
int nox = 0;
int noxRaw;
#if defined(ESP8266)
uint32_t conditioningPeriod;
uint8_t conditioningCount;