airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-08-01 09:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reformat pm correction enum naming

Browse Source
This commit is contained in:
samuelbles07
2025-02-06 12:49:41 +07:00
parent b0f5263829
commit 38aebeb50a
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/AgConfigure.cpp
View File

@@ -22,15 +22,15 @@ const char *LED_BAR_MODE_NAMES[] = {
}; };
const char *PM_CORRECTION_ALGORITHM_NAMES[] = { const char *PM_CORRECTION_ALGORITHM_NAMES[] = {
[Unknown] = "-", // This is only to pass "non-trivial designated initializers" error [COR_ALGO_PM_UNKNOWN] = "-", // This is only to pass "non-trivial designated initializers" error
[None] = "none", [COR_ALGO_PM_NONE] = "none",
[EPA_2021] = "epa_2021", [COR_ALGO_PM_EPA_2021] = "epa_2021",
[SLR_PMS5003_20220802] = "slr_PMS5003_20220802", [COR_ALGO_PM_PMS5003_20220802] = "slr_PMS5003_20220802",
[SLR_PMS5003_20220803] = "slr_PMS5003_20220803", [COR_ALGO_PM_PMS5003_20220803] = "slr_PMS5003_20220803",
[SLR_PMS5003_20220824] = "slr_PMS5003_20220824", [COR_ALGO_PM_PMS5003_20220824] = "slr_PMS5003_20220824",
[SLR_PMS5003_20231030] = "slr_PMS5003_20231030", [COR_ALGO_PM_PMS5003_20231030] = "slr_PMS5003_20231030",
[SLR_PMS5003_20231218] = "slr_PMS5003_20231218", [COR_ALGO_PM_PMS5003_20231218] = "slr_PMS5003_20231218",
[SLR_PMS5003_20240104] = "slr_PMS5003_20240104", [COR_ALGO_PM_PMS5003_20240104] = "slr_PMS5003_20240104",
}; };
const char *TEMP_HUM_CORRECTION_ALGORITHM_NAMES[] = { const char *TEMP_HUM_CORRECTION_ALGORITHM_NAMES[] = {
@@ -115,8 +115,8 @@ PMCorrectionAlgorithm Configuration::matchPmAlgorithm(String algorithm) {
// If the input string matches an algorithm name, return the corresponding enum value // If the input string matches an algorithm name, return the corresponding enum value
// Else return Unknown // Else return Unknown
const size_t enumSize = SLR_PMS5003_20240104 + 1; // Get the actual size of the enum const size_t enumSize = COR_ALGO_PM_PMS5003_20240104 + 1; // Get the actual size of the enum
PMCorrectionAlgorithm result = PMCorrectionAlgorithm::Unknown; PMCorrectionAlgorithm result = COR_ALGO_PM_UNKNOWN;;
// Loop through enum values // Loop through enum values
for (size_t enumVal = 0; enumVal < enumSize; enumVal++) { for (size_t enumVal = 0; enumVal < enumSize; enumVal++) {
@@ -166,7 +166,7 @@ bool Configuration::updatePmCorrection(JSONVar &json) {
// Check algorithm // Check algorithm
String algorithm = pm02["correctionAlgorithm"]; String algorithm = pm02["correctionAlgorithm"];
PMCorrectionAlgorithm algo = matchPmAlgorithm(algorithm); PMCorrectionAlgorithm algo = matchPmAlgorithm(algorithm);
if (algo == Unknown) { if (algo == COR_ALGO_PM_UNKNOWN) {
logInfo("Unknown algorithm"); logInfo("Unknown algorithm");
return false; return false;
} }
@@ -174,7 +174,7 @@ bool Configuration::updatePmCorrection(JSONVar &json) {
// If algo is None or EPA_2021, no need to check slr // If algo is None or EPA_2021, no need to check slr
// But first check if pmCorrection different from algo // But first check if pmCorrection different from algo
if (algo == None || algo == EPA_2021) { if (algo == COR_ALGO_PM_NONE || algo == COR_ALGO_PM_EPA_2021) {
if (pmCorrection.algorithm != algo) { if (pmCorrection.algorithm != algo) {
// Deep copy corrections from root to jconfig, so it will be saved later // Deep copy corrections from root to jconfig, so it will be saved later
jconfig[jprop_corrections]["pm02"]["correctionAlgorithm"] = algorithm; jconfig[jprop_corrections]["pm02"]["correctionAlgorithm"] = algorithm;
@@ -397,8 +397,8 @@ void Configuration::defaultConfig(void) {
jconfig[jprop_offlineMode] = jprop_offlineMode_default; jconfig[jprop_offlineMode] = jprop_offlineMode_default;
jconfig[jprop_monitorDisplayCompensatedValues] = jprop_monitorDisplayCompensatedValues_default; jconfig[jprop_monitorDisplayCompensatedValues] = jprop_monitorDisplayCompensatedValues_default;
// PM2.5 correction // PM2.5 default correction
pmCorrection.algorithm = None; pmCorrection.algorithm = COR_ALGO_PM_NONE;
pmCorrection.changed = false; pmCorrection.changed = false;
pmCorrection.intercept = 0; pmCorrection.intercept = 0;
pmCorrection.scalingFactor = 1; pmCorrection.scalingFactor = 1;
@@ -1380,7 +1380,7 @@ void Configuration::toConfig(const char *buf) {
// PM2.5 correction // PM2.5 correction
/// Set default first before parsing local config /// Set default first before parsing local config
pmCorrection.algorithm = PMCorrectionAlgorithm::None; pmCorrection.algorithm = COR_ALGO_PM_NONE;
pmCorrection.intercept = 0; pmCorrection.intercept = 0;
pmCorrection.scalingFactor = 0; pmCorrection.scalingFactor = 0;
pmCorrection.useEPA = false; pmCorrection.useEPA = false;
@@ -1526,8 +1526,8 @@ bool Configuration::isPMCorrectionChanged(void) {
*/ */
bool Configuration::isPMCorrectionEnabled(void) { bool Configuration::isPMCorrectionEnabled(void) {
PMCorrection pmCorrection = getPMCorrection(); PMCorrection pmCorrection = getPMCorrection();
if (pmCorrection.algorithm == PMCorrectionAlgorithm::None || if (pmCorrection.algorithm == COR_ALGO_PM_NONE ||
pmCorrection.algorithm == PMCorrectionAlgorithm::Unknown) { pmCorrection.algorithm == COR_ALGO_PM_UNKNOWN) {
return false; return false;
} }

6
src/AgValue.cpp
View File

@@ -658,12 +658,12 @@ float Measurements::getCorrectedPM25(bool useAvg, int ch) {
Configuration::PMCorrection pmCorrection = config.getPMCorrection(); Configuration::PMCorrection pmCorrection = config.getPMCorrection();
switch (pmCorrection.algorithm) { switch (pmCorrection.algorithm) {
case PMCorrectionAlgorithm::Unknown: case PMCorrectionAlgorithm::COR_ALGO_PM_UNKNOWN:
case PMCorrectionAlgorithm::None: case PMCorrectionAlgorithm::COR_ALGO_PM_NONE:
// If correction is Unknown, then default is None // If correction is Unknown, then default is None
corrected = pm25; corrected = pm25;
break; break;
case PMCorrectionAlgorithm::EPA_2021: case PMCorrectionAlgorithm::COR_ALGO_PM_EPA_2021:
corrected = ag->pms5003.compensate(pm25, humidity); corrected = ag->pms5003.compensate(pm25, humidity);
break; break;
default: { default: {

18
src/App/AppDef.h
View File

@@ -95,15 +95,15 @@ enum ConfigurationControl {
}; };
enum PMCorrectionAlgorithm { enum PMCorrectionAlgorithm {
Unknown, // Unknown algorithm COR_ALGO_PM_UNKNOWN, // Unknown algorithm
None, // No PM correction COR_ALGO_PM_NONE, // No PM correction
EPA_2021, COR_ALGO_PM_EPA_2021,
SLR_PMS5003_20220802, COR_ALGO_PM_PMS5003_20220802,
SLR_PMS5003_20220803, COR_ALGO_PM_PMS5003_20220803,
SLR_PMS5003_20220824, COR_ALGO_PM_PMS5003_20220824,
SLR_PMS5003_20231030, COR_ALGO_PM_PMS5003_20231030,
SLR_PMS5003_20231218, COR_ALGO_PM_PMS5003_20231218,
SLR_PMS5003_20240104, COR_ALGO_PM_PMS5003_20240104,
}; };
// Don't change the order of the enum // Don't change the order of the enum