Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -r76ede35cf15c9310c2915151f1d47998f22b71de --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 76ede35cf15c9310c2915151f1d47998f22b71de) @@ -33,6 +33,8 @@ // ********** public definitions ********** +#define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE 100.0F ///< Out of range value for RO rejection ratio when CPi conductivity is zero. + /// Conductivity data struct. typedef struct { @@ -50,19 +52,35 @@ F32 p18Conductivity; ///< (P18) conductivity sensor value } FP_CONDUCTIVITY_DATA_T; +/// RO rejection ratio data struct. +typedef struct +{ + F32 rawRORejectionRatio; ///< ro rejection ratio during tank full and fill state + F32 rawRORejectionRatioTankFill; ///< ro rejection ratio during tank fill state + F32 avgRORejectionRatio; ///< ro rejection ratio average during tank full and fill state + F32 avgRORejectionRatioTankFill; ///< ro rejection ratio average during tank fill state + U32 genPermeateState; ///< permeate tank state +} RO_REJECTION_RATIO_DATA_T; + // ********** public function prototypes ********** void initConductivity( void ); void execConductivity( void ); F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor ); F32 getFilteredConductivitySensorTemperature( CONDUCTIVITY_SENSORS_T sensor ); +F32 getRORejectonRatio( void ); +F32 getTankFillRORejectionRatio( void ); +F32 getRORRAverage( void ); +F32 getTankFillRORRAverage( void ); BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); BOOL testFPConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testFPConductivitySensorFilteredReadingsOverride( MESSAGE_T *message ); BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message ); /**@}*/