Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r316368374c18744558092bdf959a2fd6a4e5574b -r852e1ea5c0990bbb22c1bba150a461bf3552c74a
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 852e1ea5c0990bbb22c1bba150a461bf3552c74a)
@@ -331,72 +331,72 @@
     if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
     {
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
-    {
-        DG_OP_MODE_T opMode   = getCurrentOperationMode();
-        BOOL isConductTooLow  = FALSE;
-        BOOL isConductTooHigh = FALSE;
-
-        if ( FALSE == isROOnlyModeEnabled() )
         {
-            isConductTooLow  = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? TRUE : FALSE );
-            isConductTooHigh = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? TRUE : FALSE );
-        }
-        else
-        {
-            isConductTooLow  = FALSE;
-            isConductTooHigh = ( conductivity > MAX_RO_ONLY_COND_SENSOR_CPI_HIGH_US_PER_CM ? TRUE : FALSE );
-        }
+            DG_OP_MODE_T opMode   = getCurrentOperationMode();
+            BOOL isConductTooLow  = FALSE;
+            BOOL isConductTooHigh = FALSE;
 
-        switch( opMode )
-        {
-            case DG_MODE_GENE:
-            case DG_MODE_FILL:
-            case DG_MODE_DRAI:
-            case DG_MODE_STAN:
-                if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )
-                {
-                    isConductTooLow = ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? FALSE : TRUE );
-                }
+            if ( FALSE == isROOnlyModeEnabled() )
+            {
+                isConductTooLow  = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? TRUE : FALSE );
+                isConductTooHigh = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? TRUE : FALSE );
+            }
+            else
+            {
+                isConductTooLow  = FALSE;
+                isConductTooHigh = ( conductivity > MAX_RO_ONLY_COND_SENSOR_CPI_HIGH_US_PER_CM ? TRUE : FALSE );
+            }
 
-                // Per PRS 403
-                checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
-
-                if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )
-                {
-                    if ( FALSE == isROOnlyModeEnabled() )
+            switch( opMode )
+            {
+                case DG_MODE_GENE:
+                case DG_MODE_FILL:
+                case DG_MODE_DRAI:
+                case DG_MODE_STAN:
+                    if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )
                     {
-                        isConductTooHigh = ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? FALSE : TRUE );
+                        isConductTooLow = ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? FALSE : TRUE );
                     }
-                    else
+
+                    // Per PRS 403
+                    checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+
+                    if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )
                     {
-                        isConductTooHigh = ( conductivity <= MIN_RO_ONLY_COND_SENSOR_CPI_HIGH_US_PER_CM ? FALSE : TRUE );
+                        if ( FALSE == isROOnlyModeEnabled() )
+                        {
+                            isConductTooHigh = ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? FALSE : TRUE );
+                        }
+                        else
+                        {
+                            isConductTooHigh = ( conductivity <= MIN_RO_ONLY_COND_SENSOR_CPI_HIGH_US_PER_CM ? FALSE : TRUE );
+                        }
                     }
-                }
 
-                // Per PRS 404
-                checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
-                break;
+                    // Per PRS 404
+                    checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+                    break;
 
-            case DG_MODE_FLUS:
-            case DG_MODE_HEAT:
-            case DG_MODE_HCOL:
-            case DG_MODE_CHEM:
-            case DG_MODE_CHFL:
-            case DG_MODE_ROPS:
-                // Per PRS 403
-                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 );
-                break;
+                case DG_MODE_FLUS:
+                case DG_MODE_HEAT:
+                case DG_MODE_HCOL:
+                case DG_MODE_CHEM:
+                case DG_MODE_CHFL:
+                case DG_MODE_ROPS:
+                    // Per PRS 403
+                    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 );
+                    break;
 
-            default:
-                // NOTE: Do nothing for the rest of the modes
-                break;
+                default:
+                    // NOTE: Do nothing for the rest of the modes
+                    break;
+            }
         }
     }
-    }
     else
     {
         // VPI is closed - clear all alarms