Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -re6f434d5316d647bdcafd12d60c9ae2cdaa1af76 -rd70d93528b59ef7b09032a3bf4128bee0ff6e297
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e6f434d5316d647bdcafd12d60c9ae2cdaa1af76)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d70d93528b59ef7b09032a3bf4128bee0ff6e297)
@@ -8,7 +8,7 @@
 * @file    ConductivitySensors.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      11-Jan-2023
+* @date    (last)      18-Jan-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  13-Jul-2020
@@ -195,8 +195,8 @@
     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, 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_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 );
@@ -305,17 +305,17 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                if ( ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )
                 {
-                    isConductTooLow = FALSE;
+                    isConductTooLow = ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_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 );
 
-                if ( ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )
                 {
-                    isConductTooHigh = FALSE;
+                    isConductTooHigh = ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? FALSE : TRUE );
                 }
 
                 // Per PRS 404