Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -rb6b17e417c14f820a81e93dd7b20aa9dd790a7c1 -rfd897db8177752330ad08d877e0a13620513dbdc --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision b6b17e417c14f820a81e93dd7b20aa9dd790a7c1) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision fd897db8177752330ad08d877e0a13620513dbdc) @@ -7,8 +7,8 @@ * * @file Conductivity.c * -* @author (last) Michael Garthwaite -* @date (last) 15-Apr-2026 +* @author (last) Sameer Kalliadan Poyil +* @date (last) 16-Apr-2026 * * @author (original) Vinayakam Mani * @date (original) 13-Sep-2024 @@ -33,6 +33,7 @@ // ********** private definitions ********** #define COND_SENSOR_REPORT_PERIOD ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Broadcast conductivity values message every second. +#define COND_SENSOR_UPDATE_INTERVAL ( 700 / TASK_PRIORITY_INTERVAL ) ///< Time in task intervals for new sensor data #define DATA_PUBLISH_COUNTER_START_COUNT 40 ///< Data publish counter start count. #define CONDUCTIVITY_SAMPLE_FILTER_MS ( 50 ) ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate ) #define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS ( 50 ) ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate ) @@ -83,6 +84,10 @@ static U32 roRRCount; ///< RO rejection ratio Number of samples in average buffer. static F32 roRRTankFillAvg; ///< Average RO rejection ratio during permeate tank fill state. static U32 roRRSampleIntervalCounter; ///< RO rejection ratio sample collection timer counter. +static U32 condtempDataCollectionTimeInterval; ///< Conductivity Temperature data collection time interval in task counts. +static U32 condtempSampleIntervalCounter; ///< Conductivity Temperature sensor sample collection timer counter. +static U32 condDataCollectionTimeInterval; ///< Conductivity data collection time interval in task counts. +static U32 condSampleIntervalCounter; ///< Conductivity sensor sample collection timer counter. // ********** private function prototypes ********** @@ -121,6 +126,8 @@ roRRAvg.ovInitData = 0.0F; roRRAvg.override = OVERRIDE_RESET; roRRSampleIntervalCounter = 0; + condtempDataCollectionTimeInterval= COND_SENSOR_UPDATE_INTERVAL; + condtempSampleIntervalCounter = 0; memset( &roRRSamples, 0, sizeof( roRRSamples ) );