Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r2453a1f92978ed1900becfc0dda2cf5a9b8e8d0b -rb0f71f7faa129e67fa5a36629801e4ae6a0173f4 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 2453a1f92978ed1900becfc0dda2cf5a9b8e8d0b) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision b0f71f7faa129e67fa5a36629801e4ae6a0173f4) @@ -70,7 +70,7 @@ // ********** private function prototypes ********** -static void processCPiCPoSensorRead( U32 sensorId, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount ); +static void processCPiCPoSensorRead( U32 sensorId, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount, U08 fpgaSensorFault ); static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature); static void calcRORejectionRatio( void ); static F32 getRORejectionRatio( void ); @@ -123,8 +123,8 @@ *************************************************************************/ void execConductivitySensors( void ) { - processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPI_SENSOR, getFPGACPi(), getFPGACPiReadCount(), getFPGACPiErrorCount() ); - processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPO_SENSOR, getFPGACPo(), getFPGACPoReadCount(), getFPGACPoErrorCount() ); + processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPI_SENSOR, getFPGACPi(), getFPGACPiReadCount(), getFPGACPiErrorCount(), getFPGACPiFault() ); + processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPO_SENSOR, getFPGACPo(), getFPGACPoReadCount(), getFPGACPoErrorCount(), getFPGACPoFault() ); if ( ++conductivityDataPublicationTimerCounter >= getConductivityDataPublishInterval() ) { @@ -281,9 +281,9 @@ * @param fpgaErrorCount FPGA error count * @return none *************************************************************************/ -static void processCPiCPoSensorRead( U32 sensorId, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount ) +static void processCPiCPoSensorRead( U32 sensorId, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount, U08 fpgaSensorFault ) { - if ( fpgaErrorCount == 0 ) + if ( ( fpgaErrorCount == 0 ) && ( fpgaSensorFault == 0 ) ) { if ( ( readCount[ sensorId ] != fpgaReadCount ) ) {