Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -rb9d148dce4c70d0dca63f34fce73c22a7bfd4fbc -rafb8316aee80115f0e0712a31a12adbd39a9cedf --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision b9d148dce4c70d0dca63f34fce73c22a7bfd4fbc) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision afb8316aee80115f0e0712a31a12adbd39a9cedf) @@ -56,6 +56,11 @@ F32 d29RTDResist; ///< D29 raw resistance value from RTD F32 d43RTDResist; ///< D43 raw resistance value from RTD F32 d74RTDResist; ///< D74 raw resistance value from RTD + F32 d17CondUncomp; ///< D17 conductivity sensor value without temperature compensation + F32 d27CondUncomp; ///< D27 conductivity sensor value without temperature compensation + F32 d29CondUncomp; ///< D29 conductivity sensor value without temperature compensation + F32 d43CondUncomp; ///< D43 conductivity sensor value without temperature compensation + F32 d74CondUncomp; ///< D74 conductivity sensor value without temperature compensation } DD_CONDUCTIVITY_DATA_T; /// Conductivity data struct. @@ -67,6 +72,8 @@ F32 p18CondResist; ///< P18 raw resistance value from conductivity F32 p9RTDResist; ///< P9 raw resistance value from RTD F32 p18RTDResist; ///< P18 raw resistance value from RTD + F32 p9CondUncomp; ///< P9 conductivity sensor value without temperature compensation + F32 p18CondUncomp; ///< P18 conductivity sensor value without temperature compensation } FP_CONDUCTIVITY_DATA_T; /// RO rejection ratio data struct. @@ -91,6 +98,7 @@ F32 getTankFillRORejectionRatio( void ); F32 getRORRAverage( void ); F32 getTankFillRORRAverage( void ); +F32 getFilteredUConductivity( CONDUCTIVITY_SENSORS_T sensor ); BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );