Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -re95b1d3c47166be8a6852818a70b4c6231881b86 -r5aee05d242962c2f9294577c3ba5015f9342fb83
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e95b1d3c47166be8a6852818a70b4c6231881b86)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5aee05d242962c2f9294577c3ba5015f9342fb83)
@@ -57,6 +57,8 @@
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS       ( 60 * MS_PER_SECOND )                      ///< Conductivity sensor error window.
 
 #define COND_SENSOR_PERSISTENCE_PERIOD                  ( 5 * MS_PER_SECOND )                       ///< Persistence period for conductivity sensor out of range error.
+#define INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS ( 5 * MS_PER_SECOND )                       ///< Inlet water conductivity sensor out of range timeout in milliseconds.
+#define INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS   ( 1 * MS_PER_SECOND )                       ///< Inlet water conductivity sensor out of range clear in milliseconds.
 
 #define EMSTAT_PICO_MEASUREMENT_OFFSET                  0x8000000                                   ///< Emstat measurement offset.
 // The below Emstat status values come from the MethodScript-v1_2-1.pdf. See page 10 table 4 for further information
@@ -192,14 +194,14 @@
     setFPGACPiProbeType( COND_CPI_SENSOR_PROBE_TYPE );
     setFPGACPoProbeType( COND_CPO_SENSOR_PROBE_TYPE );
 
-    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,      COND_SENSOR_PERSISTENCE_PERIOD,            COND_SENSOR_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE,       COND_SENSOR_PERSISTENCE_PERIOD,            COND_SENSOR_PERSISTENCE_PERIOD );
-    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 );
-    initPersistentAlarm( ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR,             COND_SENSORS_BAD_CHAR_TIME_OUT_MS,         COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
+    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_TIMEOUT_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_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 );
+    initPersistentAlarm( ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR, COND_SENSORS_BAD_CHAR_TIME_OUT_MS, COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
 
@@ -295,22 +297,31 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        DG_OP_MODE_T opMode          = getCurrentOperationMode();
-        F32 conductivity             = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
-        BOOL isConductTooLow         = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? TRUE : FALSE );
-        BOOL isConductInWarningRange = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? TRUE : FALSE );
+        DG_OP_MODE_T opMode   = getCurrentOperationMode();
+        F32 conductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
+        BOOL isConductTooLow  = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? TRUE : FALSE );
+        BOOL isConductTooHigh = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? TRUE : FALSE );
 
         switch( opMode )
         {
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                isConductTooLow         = ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? FALSE: TRUE );
-                isConductInWarningRange = ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? FALSE : TRUE );
+                if ( ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) ) )
+                {
+                    isConductTooLow = FALSE;
+                }
+
                 // Per PRS 403
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+
+                if ( ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) ) )
+                {
+                    isConductTooHigh = FALSE;
+                }
+
                 // Per PRS 404
-                checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+                checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
                 break;
 
             case DG_MODE_INIT:
@@ -322,7 +333,7 @@
                 if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
                 {
                     // Per PRS 403
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
                     // Per PRS 404
                     checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
                 }