Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rb18590ffa370d1e22f32a89510a0005fcb16408b -r8b840006f7e1f3e64b9b79592ac907dac6476a31
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 8b840006f7e1f3e64b9b79592ac907dac6476a31)
@@ -202,7 +202,6 @@
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS, COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD, COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR, COND_SENSORS_BAD_CHAR_TIME_OUT_MS, COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR, COND_SENSORS_BAD_CHAR_TIME_OUT_MS, COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR, COND_SENSORS_BAD_CHAR_TIME_OUT_MS, COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
@@ -527,7 +526,6 @@
         case EMSTAT_CPI_CPO_BOARD:
             // Check for continuous incoming bytes
             rxFifoCount = getFPGAEmstatCPiCPoRxFifoCount() & EMSTAT_RX_FIFO_COUNT_MASK;
-
             checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CPI_CPO_COND_SENSORS, rxFifoCount );
 
             // Only process the sensor read if there is a new byte
@@ -540,7 +538,7 @@
 
         case EMSTAT_CD1_CD2_BOARD:
             // Check for continuous incoming bytes
-            rxFifoCount = getFPGAEmstatCD1CD2RxFifoCount() & EMSTAT_RX_FIFO_COUNT_MASK;;
+            rxFifoCount = getFPGAEmstatCD1CD2RxFifoCount() & EMSTAT_RX_FIFO_COUNT_MASK;
             checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD1_CD2_COND_SENSORS, rxFifoCount );
 
             // Only process the sensor read if there is a new byte
@@ -620,7 +618,7 @@
 
     CONDUCTIVITY_SENSORS_T sensorId = readPackage->sensors[ boardSensorIndex ].condSnsr;
     BOOL convStatus                 = hexStrToDec( (U08*)&receivedPackets->status, &condSensorStatus[ sensorId ].sensorStatus, sizeof( receivedPackets->status ) );
-    BOOL isSensorStatusBad          = ( EMSTAT_PICO_STATUS_OK == condSensorStatus[ sensorId ].sensorStatus ? FALSE : TRUE );
+    BOOL isSensorStatusBad          = ( EMSTAT_PICO_STATUS_TIMING_NOT_MET == condSensorStatus[ sensorId ].sensorStatus ? TRUE : FALSE );
     ALARM_ID_T badHexAlarm          = readPackage->sensors[ boardSensorIndex ].condSnsrHex2StrAlarm;
     BOOL isConvNotValid             = FALSE;
 
@@ -642,10 +640,8 @@
     isConvNotValid = ( TRUE == convStatus ? FALSE : TRUE );
     // Check the conductivity sensors bad status alarm
     checkPersistentAlarm( badHexAlarm, isConvNotValid, isConvNotValid, COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
-    checkPersistentAlarm( ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS, isSensorStatusBad, condSensorStatus[ sensorId ].sensorStatus,
-                          EMSTAT_PICO_STATUS_TIMING_NOT_MET );
 
-    if ( EMSTAT_PICO_STATUS_OK != condSensorStatus[ sensorId ].sensorStatus )
+    if ( EMSTAT_PICO_STATUS_TIMING_NOT_MET == condSensorStatus[ sensorId ].sensorStatus )
     {
         if ( ++condSensorStatus[ sensorId ].internalErrorCount > MAX_CONDUCTIVITY_SENSOR_FAILURES )
         {