feedc0de/airgradient
1
0
Fork 0
forked from airgradienthq/arduino
Code Pull Requests Activity

Optional to debug every measurement update value

Browse Source
This commit is contained in:
samuelbles07
2024-10-21 00:43:04 +07:00
parent f7e1363da9
commit 8548d3e9f4
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/AgValue.cpp
View File

@ -132,7 +132,9 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
// Calculate average based on how many elements on the list // Calculate average based on how many elements on the list
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size(); temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type), ch, temporary->update.avg); if (_debug) {
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type), ch, temporary->update.avg);
}
return true; return true;
} }
@ -193,7 +195,9 @@ bool Measurements::update(MeasurementType type, float val, int ch) {
// Calculate average based on how many elements on the list // Calculate average based on how many elements on the list
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size(); temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type), ch, temporary->update.avg); if (_debug) {
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type), ch, temporary->update.avg);
}
return true; return true;
} }
@ -398,7 +402,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
} }
String result = JSON.stringify(root); String result = JSON.stringify(root);
Serial.printf("\n----\n %s \n-----\n", result.c_str()); Serial.printf("\n---- PAYLOAD\n %s \n-----\n", result.c_str());
return result; return result;
} }
@ -724,4 +728,6 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
} }
return pms; return pms;
} }
void Measurements::setDebug(bool debug) { _debug = debug; }

16
src/AgValue.h
View File

@ -106,12 +106,20 @@ public:
*/ */
float getFloat(MeasurementType type, int ch = 1); float getFloat(MeasurementType type, int ch = 1);
// TODO: update this to using setter /**
int bootCount; * build json payload for every measurements
*/
String toString(bool localServer, AgFirmwareMode fwMode, int rssi, AirGradient &ag, String toString(bool localServer, AgFirmwareMode fwMode, int rssi, AirGradient &ag,
Configuration &config); Configuration &config);
/**
* Set to true if want to debug every update value
*/
void setDebug(bool debug);
// TODO: update this to use setter
int bootCount;
private: private:
// Some declared as an array (channel), because FW_MODE_O_1PPx has two PMS5003T // Some declared as an array (channel), because FW_MODE_O_1PPx has two PMS5003T
FloatValue _temperature[2]; FloatValue _temperature[2];
@ -126,6 +134,8 @@ private:
IntegerValue _pm_10[2]; IntegerValue _pm_10[2];
IntegerValue _pm_03_pc[2]; // particle count 0.3 IntegerValue _pm_03_pc[2]; // particle count 0.3
bool _debug = false;
/** /**
* @brief Get PMS5003 firmware version string * @brief Get PMS5003 firmware version string
* *