Fix variable naming ahum to rhum

This commit is contained in:
samuelbles07
2025-02-05 10:57:02 +07:00
parent 4bb97fc8be
commit 4b09b98524
4 changed files with 17 additions and 17 deletions

View File

@ -66,7 +66,7 @@ String OpenMetrics::getPayload(void) {
int pm03PCount = utils::getInvalidPmValue(); int pm03PCount = utils::getInvalidPmValue();
int co2 = utils::getInvalidCO2(); int co2 = utils::getInvalidCO2();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int rhumCompensated = utils::getInvalidHumidity();
int tvoc = utils::getInvalidVOC(); int tvoc = utils::getInvalidVOC();
int tvocRaw = utils::getInvalidVOC(); int tvocRaw = utils::getInvalidVOC();
int nox = utils::getInvalidNOx(); int nox = utils::getInvalidNOx();
@ -76,7 +76,7 @@ String OpenMetrics::getPayload(void) {
_temp = measure.getFloat(Measurements::Temperature); _temp = measure.getFloat(Measurements::Temperature);
_hum = measure.getFloat(Measurements::Humidity); _hum = measure.getFloat(Measurements::Humidity);
atmpCompensated = _temp; atmpCompensated = _temp;
ahumCompensated = _hum; rhumCompensated = _hum;
} }
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
@ -191,12 +191,12 @@ String OpenMetrics::getPayload(void) {
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(_hum)); add_metric_point("", String(_hum));
} }
if (utils::isValidHumidity(ahumCompensated)) { if (utils::isValidHumidity(rhumCompensated)) {
add_metric("humidity_compensated", add_metric("humidity_compensated",
"The compensated relative humidity as measured by the " "The compensated relative humidity as measured by the "
"AirGradient SHT / PMS sensor", "AirGradient SHT / PMS sensor",
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(ahumCompensated)); add_metric_point("", String(rhumCompensated));
} }
response += "# EOF\n"; response += "# EOF\n";

View File

@ -66,7 +66,7 @@ String OpenMetrics::getPayload(void) {
int pm03PCount = utils::getInvalidPmValue(); int pm03PCount = utils::getInvalidPmValue();
int co2 = utils::getInvalidCO2(); int co2 = utils::getInvalidCO2();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int rhumCompensated = utils::getInvalidHumidity();
int tvoc = utils::getInvalidVOC(); int tvoc = utils::getInvalidVOC();
int tvocRaw = utils::getInvalidVOC(); int tvocRaw = utils::getInvalidVOC();
int nox = utils::getInvalidNOx(); int nox = utils::getInvalidNOx();
@ -76,7 +76,7 @@ String OpenMetrics::getPayload(void) {
_temp = measure.getFloat(Measurements::Temperature); _temp = measure.getFloat(Measurements::Temperature);
_hum = measure.getFloat(Measurements::Humidity); _hum = measure.getFloat(Measurements::Humidity);
atmpCompensated = _temp; atmpCompensated = _temp;
ahumCompensated = _hum; rhumCompensated = _hum;
} }
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
@ -192,12 +192,12 @@ String OpenMetrics::getPayload(void) {
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(_hum)); add_metric_point("", String(_hum));
} }
if (utils::isValidHumidity(ahumCompensated)) { if (utils::isValidHumidity(rhumCompensated)) {
add_metric("humidity_compensated", add_metric("humidity_compensated",
"The compensated relative humidity as measured by the " "The compensated relative humidity as measured by the "
"AirGradient SHT / PMS sensor", "AirGradient SHT / PMS sensor",
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(ahumCompensated)); add_metric_point("", String(rhumCompensated));
} }
response += "# EOF\n"; response += "# EOF\n";

View File

@ -66,7 +66,7 @@ String OpenMetrics::getPayload(void) {
int pm03PCount = utils::getInvalidPmValue(); int pm03PCount = utils::getInvalidPmValue();
int co2 = utils::getInvalidCO2(); int co2 = utils::getInvalidCO2();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int rhumCompensated = utils::getInvalidHumidity();
int tvoc = utils::getInvalidVOC(); int tvoc = utils::getInvalidVOC();
int tvocRaw = utils::getInvalidVOC(); int tvocRaw = utils::getInvalidVOC();
int nox = utils::getInvalidNOx(); int nox = utils::getInvalidNOx();
@ -76,7 +76,7 @@ String OpenMetrics::getPayload(void) {
_temp = measure.getFloat(Measurements::Temperature); _temp = measure.getFloat(Measurements::Temperature);
_hum = measure.getFloat(Measurements::Humidity); _hum = measure.getFloat(Measurements::Humidity);
atmpCompensated = _temp; atmpCompensated = _temp;
ahumCompensated = _hum; rhumCompensated = _hum;
} }
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
@ -191,12 +191,12 @@ String OpenMetrics::getPayload(void) {
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(_hum)); add_metric_point("", String(_hum));
} }
if (utils::isValidHumidity(ahumCompensated)) { if (utils::isValidHumidity(rhumCompensated)) {
add_metric("humidity_compensated", add_metric("humidity_compensated",
"The compensated relative humidity as measured by the " "The compensated relative humidity as measured by the "
"AirGradient SHT / PMS sensor", "AirGradient SHT / PMS sensor",
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(ahumCompensated)); add_metric_point("", String(rhumCompensated));
} }
response += "# EOF\n"; response += "# EOF\n";

View File

@ -66,7 +66,7 @@ String OpenMetrics::getPayload(void) {
int pm03PCount = utils::getInvalidPmValue(); int pm03PCount = utils::getInvalidPmValue();
int co2 = utils::getInvalidCO2(); int co2 = utils::getInvalidCO2();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int rhumCompensated = utils::getInvalidHumidity();
int tvoc = utils::getInvalidVOC(); int tvoc = utils::getInvalidVOC();
int tvocRaw = utils::getInvalidVOC(); int tvocRaw = utils::getInvalidVOC();
int nox = utils::getInvalidNOx(); int nox = utils::getInvalidNOx();
@ -138,12 +138,12 @@ String OpenMetrics::getPayload(void) {
/** Get temperature and humidity compensated */ /** Get temperature and humidity compensated */
if (ag->isOne()) { if (ag->isOne()) {
atmpCompensated = round(measure.getCorrectedTempHum(Measurements::Temperature)); atmpCompensated = round(measure.getCorrectedTempHum(Measurements::Temperature));
ahumCompensated = round(measure.getCorrectedTempHum(Measurements::Humidity)); rhumCompensated = round(measure.getCorrectedTempHum(Measurements::Humidity));
} else { } else {
atmpCompensated = round((measure.getCorrectedTempHum(Measurements::Temperature, 1) + atmpCompensated = round((measure.getCorrectedTempHum(Measurements::Temperature, 1) +
measure.getCorrectedTempHum(Measurements::Temperature, 2)) / measure.getCorrectedTempHum(Measurements::Temperature, 2)) /
2.0f); 2.0f);
ahumCompensated = round((measure.getCorrectedTempHum(Measurements::Humidity, 1) + rhumCompensated = round((measure.getCorrectedTempHum(Measurements::Humidity, 1) +
measure.getCorrectedTempHum(Measurements::Humidity, 2)) / measure.getCorrectedTempHum(Measurements::Humidity, 2)) /
2.0f); 2.0f);
} }
@ -238,11 +238,11 @@ String OpenMetrics::getPayload(void) {
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(_hum)); add_metric_point("", String(_hum));
} }
if (utils::isValidHumidity(ahumCompensated)) { if (utils::isValidHumidity(rhumCompensated)) {
add_metric("humidity_compensated", add_metric("humidity_compensated",
"The compensated relative humidity as measured by the AirGradient SHT / PMS sensor", "The compensated relative humidity as measured by the AirGradient SHT / PMS sensor",
"gauge", "percent"); "gauge", "percent");
add_metric_point("", String(ahumCompensated)); add_metric_point("", String(rhumCompensated));
} }
response += "# EOF\n"; response += "# EOF\n";