Index: firmware/App/Controllers/ConductivitySensors.h =================================================================== diff -u -r025612ad77fe630889a364586de54bffe5262d56 -r60e0810fec7299b2c280fd26817ddb1202957fcb --- firmware/App/Controllers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 025612ad77fe630889a364586de54bffe5262d56) +++ firmware/App/Controllers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 60e0810fec7299b2c280fd26817ddb1202957fcb) @@ -61,6 +61,10 @@ F32 cpo; ///< CPo conductivity sensor value F32 cd1; ///< CD1 conductivity sensor value F32 cd2; ///< CD2 conductivity sensor value + F32 cpiRaw; ///< CPi raw conductivity sensor value (without 2% temperature compensated) + F32 cpoRaw; ///< CPo raw conductivity sensor value (without 2% temperature compensated) + F32 cd1Raw; ///< CD1 raw conductivity sensor value (without 2% temperature compensated) + F32 cd2Raw; ///< CD2 raw conductivity sensor value (without 2% temperature compensated) } CONDUCTIVITY_DATA_T; // ********** public function prototypes ********** @@ -74,10 +78,14 @@ void checkRORejectionRatio( void ); F32 getConductivityValue( U32 sensorId ); +F32 getRawConductivityValue( U32 sensorId ); BOOL testSetConductivityOverride( U32 sensorId, F32 value ); BOOL testResetConductivityOverride( U32 sensorId ); +BOOL testSetRawConductivityOverride( U32 sensorId, F32 value ); +BOOL testResetRawConductivityOverride( U32 sensorId ); + BOOL testSetConductivityDataPublishIntervalOverride( U32 interval_ms ); BOOL testResetConductivityDataPublishIntervalOverride( void );