diff --git a/examples/BASIC_v4/BASIC_v4.ino b/examples/BASIC_v4/BASIC_v4.ino index 8fdedca..9583ca3 100644 --- a/examples/BASIC_v4/BASIC_v4.ino +++ b/examples/BASIC_v4/BASIC_v4.ino @@ -305,7 +305,7 @@ public: * * @return int days, -1 if invalid. */ - int getCo2Abccalib(void) { return co2AbcCalib; } + int getCo2AbcDaysConfig(void) { return co2AbcCalib; } /** * @brief Get device configuration model name @@ -562,9 +562,15 @@ static void serverConfigPoll(void) { if (agServer.isCo2Calib()) { co2Calibration(); } - if (agServer.getCo2Abccalib() > 0) { - if (ag.s8.setAutoCalib(agServer.getCo2Abccalib() * 24) == false) { - Serial.println("Set S8 auto calib failed"); + if (agServer.getCo2AbcDaysConfig() > 0) { + Serial.printf("abcDays config: %d days(%d hours)\r\n", + agServer.getCo2AbcDaysConfig(), + agServer.getCo2AbcDaysConfig() * 24); + Serial.printf("Current config: %d (hours)\r\n", ag.s8.getAbcPeriod()); + if (ag.s8.setAbcPeriod(agServer.getCo2AbcDaysConfig() * 24) == false) { + Serial.println("Set S8 abcDays period calib failed"); + } else { + Serial.println("Set S8 abcDays period calib success"); } } } diff --git a/examples/ONE_I-9PSL/ONE_I-9PSL.ino b/examples/ONE_I-9PSL/ONE_I-9PSL.ino index a2ba33c..2ac75e6 100644 --- a/examples/ONE_I-9PSL/ONE_I-9PSL.ino +++ b/examples/ONE_I-9PSL/ONE_I-9PSL.ino @@ -372,7 +372,7 @@ public: * * @return int days, -1 if invalid. */ - int getCo2Abccalib(void) { return co2AbcCalib; } + int getCo2AbcDaysConfig(void) { return co2AbcCalib; } /** * @brief Get device configuration model name @@ -1086,9 +1086,15 @@ static void serverConfigPoll(void) { if (agServer.isCo2Calib()) { co2Calibration(); } - if (agServer.getCo2Abccalib() > 0) { - if (ag.s8.setAutoCalib(agServer.getCo2Abccalib() * 24) == false) { - Serial.println("Set S8 auto calib failed"); + if (agServer.getCo2AbcDaysConfig() > 0) { + Serial.printf("abcDays config: %d days(%d hours)\r\n", + agServer.getCo2AbcDaysConfig(), + agServer.getCo2AbcDaysConfig() * 24); + Serial.printf("Current config: %d (hours)\r\n", ag.s8.getAbcPeriod()); + if (ag.s8.setAbcPeriod(agServer.getCo2AbcDaysConfig() * 24) == false) { + Serial.println("Set S8 abcDays period calib failed"); + } else { + Serial.println("Set S8 abcDays period calib success"); } } if (agServer.isLedBarTestRequested()) { diff --git a/examples/Open_Air/Open_Air.ino b/examples/Open_Air/Open_Air.ino index 2f3dae5..d517e62 100644 --- a/examples/Open_Air/Open_Air.ino +++ b/examples/Open_Air/Open_Air.ino @@ -347,7 +347,7 @@ public: * * @return int days, -1 if invalid. */ - int getCo2Abccalib(void) { return co2AbcCalib; } + int getCo2AbcDaysConfig(void) { return co2AbcCalib; } /** * @brief Get device configuration model name @@ -373,7 +373,7 @@ public: Serial.printf(" useRGBLedBar: %d\r\n", (int)ledBarMode); Serial.printf(" Model: %s\r\n", models); Serial.printf(" Mqtt Broker: %s\r\n", mqttBroker); - Serial.printf(" S8 calib period: %d\r\n", co2AbcCalib); + Serial.printf(" abcDays period: %d\r\n", co2AbcCalib); } /** @@ -847,9 +847,15 @@ static void serverConfigPoll(void) { if (agServer.isCo2Calib()) { co2Calibration(); } - if (agServer.getCo2Abccalib() > 0) { - if (ag.s8.setAutoCalib(agServer.getCo2Abccalib() * 24) == false) { - Serial.println("Set S8 auto calib failed"); + if (agServer.getCo2AbcDaysConfig() > 0) { + Serial.printf("abcDays config: %d days(%d hours)\r\n", + agServer.getCo2AbcDaysConfig(), + agServer.getCo2AbcDaysConfig() * 24); + Serial.printf("Current config: %d (hours)\r\n", ag.s8.getAbcPeriod()); + if (ag.s8.setAbcPeriod(agServer.getCo2AbcDaysConfig() * 24) == false) { + Serial.println("Set S8 abcDays period calib failed"); + } else { + Serial.println("Set S8 abcDays period calib success"); } } } diff --git a/src/s8/s8.cpp b/src/s8/s8.cpp index 628cc5b..3e76583 100644 --- a/src/s8/s8.cpp +++ b/src/s8/s8.cpp @@ -801,7 +801,7 @@ void S8::sendCommand(uint8_t func, uint16_t reg, uint16_t value) { * @return true Success * @return false Failure */ -bool S8::setAutoCalib(int hours) { +bool S8::setAbcPeriod(int hours) { if (isBegin() == false) { return false; } @@ -813,3 +813,10 @@ bool S8::setAutoCalib(int hours) { return setCalibPeriodABC(hours); } + +/** + * @brief Get current 'ABC' calib period + * + * @return int Hour + */ +int S8::getAbcPeriod(void) { return getCalibPeriodABC(); } diff --git a/src/s8/s8.h b/src/s8/s8.h index b967a9e..5d18952 100644 --- a/src/s8/s8.h +++ b/src/s8/s8.h @@ -78,7 +78,8 @@ public: int16_t getCo2(void); bool setBaselineCalibration(void); bool isBaseLineCalibrationDone(void); - bool setAutoCalib(int hours); + bool setAbcPeriod(int hours); + int getAbcPeriod(void); private: /** Variables */