Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r18a20aa5b66f0b6123f066ce2c79b9fb056a0469 -r35179cc5895f6b7b9b1f8338754836898514a14e
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 18a20aa5b66f0b6123f066ce2c79b9fb056a0469)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 35179cc5895f6b7b9b1f8338754836898514a14e)
@@ -27,6 +27,7 @@
 #include "TaskPriority.h"
 #include "TemperatureSensors.h"
 #include "Utilities.h"
+#include "Valves.h"
 
 /**
  *  @addtogroup ConductivitySensors
@@ -45,11 +46,11 @@
 #define COND_SENSOR_REFERENCE_TEMPERATURE               25.0F                                       ///< Reference temperature for conductivity sensor.
 #define COND_SENSOR_REPORT_PERIOD                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< Broadcast conductivity values message every second.
 
-#define MAX_COND_SENSOR_CPI_WARNING_HIGH                2000.0F                                     ///< Maximum allowed high conductivity value.
-#define MIN_COND_SENSOR_CPI_WARNING_HIGH                1990.0F                                     ///< Minimum allowed high conductivity value.
+#define MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM      2000.0F                                     ///< Maximum allowed high conductivity value in uS/cm.
+#define MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM      1990.0F                                     ///< Minimum allowed high conductivity value in uS/cm.
 
-#define MAX_COND_SENSOR_CPI_WARNING_LOW                 100.0F                                      ///< Maximum allowed low conductivity value.
-#define MIN_COND_SENSOR_CPI_WARNING_LOW                 110.0F                                      ///< Minimum allowed low conductivity value.
+#define MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM       200.0F                                      ///< Maximum allowed low conductivity value in uS/cm.
+#define MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM       220.0F                                      ///< Minimum allowed low conductivity value in uS/cm.
 
 #define MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS        ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< New reading every 800 ms, expect to get valid new reading in 1s.
 #define MAX_CONDUCTIVITY_SENSOR_FAILURES                5                                           ///< maximum number of conductivity sensor errors within window period before alarm.
@@ -207,6 +208,8 @@
     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 );
 
     // Initialize the conductivity sensors' FPGA alarms
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPI_CPO_COND_SENSORS, ALARM_ID_DG_CPI_CPO_SENSORS_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
@@ -298,29 +301,43 @@
     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 ? TRUE : FALSE );
-        BOOL isConductInWarningRange = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH ? TRUE : FALSE );
+        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 );
 
-        // Warning per PRS 403
-        if ( TRUE == isConductTooLow )
+        switch( opMode )
         {
-            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
-        }
-        else if ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW )
-        {
-            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
-        }
+            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 );
+                // Per PRS 403
+                checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+                // Per PRS 404
+                checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+                break;
 
-        // Warning per PRS 404
-        if ( TRUE == isConductInWarningRange )
-        {
-            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
+            // TODO add chem flush and heat disinfect cooling modes once they are created
+            case DG_MODE_INIT:
+            case DG_MODE_STAN:
+            case DG_MODE_FLUS:
+            case DG_MODE_HEAT:
+            case DG_MODE_CHEM:
+                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 );
+                    // 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 );
+                }
+                break;
+
+            default:
+                // NOTE: Do nothing for the rest of the modes
+                break;
         }
-        else if ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH )
-        {
-            checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
-        }
     }
 }