Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r069fa54e253b9eca056ad51743a414854867b1ac -raa8dbad6005f0f63b846673ac1656b003fbf85e3
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 069fa54e253b9eca056ad51743a414854867b1ac)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision aa8dbad6005f0f63b846673ac1656b003fbf85e3)
@@ -43,16 +43,18 @@
 #define COND_SENSOR_REFERENCE_TEMPERATURE               25                                          ///< Reference temperature for conductivity sensor.
 #define COND_SENSOR_REPORT_PERIOD                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< Broadcast conductivity values message every second.
 
-#define COND_SENSOR_CPI_WARNING_HIGH                    2200                                        ///< Warning high value for inlet water conductivity.
-#define COND_SENSOR_CPI_WARNING_LOW                     2000                                        ///< Warning low value for inlet water conductivity.
-#define COND_SENSOR_CPI_MIN_VALUE                       100                                         ///< Minimum inlet water conductivity.
+#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_LOW                 100.0F                                      ///< Maximum allowed low conductivity value.
+#define MIN_COND_SENSOR_CPI_WARNING_LOW                 110.0F                                      ///< Minimum allowed low conductivity value.
+
 #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.
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS       ( 60 * MS_PER_SECOND )                      ///< Conductivity sensor error window.
 
 #define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE           1.0                                         ///< Out of range value for RO rejection ratio when CPi conductivity is zero.
-#define MAX_RO_REJECTION_RATIO_ALLOW                    0.15                                        ///< Maximum RO rejection ratio.
+#define MAX_RO_REJECTION_RATIO_ALLOW                    0.10F                                       ///< Maximum RO rejection ratio.
 #define MAX_CPO_CONDUCTIVITY_ALLOW                      30.0                                        ///< Maximum CPo sensor conductivity value.
 
 #define COND_SENSOR_PERSISTENCE_PERIOD                  ( 5 * MS_PER_SECOND )                       ///< Persistence period for conductivity sensor out of range error.
@@ -141,8 +143,8 @@
 
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
     initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
+    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_RO_REJECTION_RATIO_OUT_OF_RANGE, RO_REJECTION_RATIO_PERSISTENCE_PERIOD, RO_REJECTION_RATIO_PERSISTENCE_PERIOD );
 }
 
@@ -225,27 +227,29 @@
 {
 #ifndef DISABLE_WATER_QUALITY_CHECK
 
-    F32 const conductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
+    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 const isConductTooLow          = ( conductivity <= COND_SENSOR_CPI_MIN_VALUE ) ? TRUE : FALSE;
-
-    BOOL const isConductTooHigh         = ( conductivity >= COND_SENSOR_CPI_WARNING_HIGH ) ? TRUE : FALSE ;
-
-    BOOL const isConductInWarningRange  = ( conductivity >= COND_SENSOR_CPI_WARNING_LOW ) &&
-                                          ( conductivity <  COND_SENSOR_CPI_WARNING_HIGH ) ? TRUE : FALSE;
-
+    // Alarm per PRS 403
     if ( TRUE == isConductTooLow )
     {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, isConductTooLow, conductivity, COND_SENSOR_CPI_MIN_VALUE );
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
     }
-    else if ( TRUE == isConductTooHigh )
+    else if ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW )
     {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, isConductTooHigh, conductivity, COND_SENSOR_CPI_WARNING_LOW );
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW );
     }
-    else if ( TRUE == isConductInWarningRange )
+
+    // Alarm per PRS 404
+    if ( TRUE == isConductInWarningRange )
     {
-        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE, isConductInWarningRange, conductivity, COND_SENSOR_CPI_WARNING_HIGH );
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, isConductInWarningRange, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
     }
+    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 );
+    }
 
 #endif
 }
@@ -262,10 +266,13 @@
 void checkRORejectionRatio( void )
 {
 #ifndef DISABLE_RO_RATIO_CHECK
-    F32 const cpo = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-    BOOL const isRORejectionRatioOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ) || ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW );
+    F32 cpo                    = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
+    BOOL isRORectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
 
-    checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORejectionRatioOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
+    //BOOL isRORejRatioOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ) || ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ); // TODO why is conductivity checked here again?
+
+    // Fault alarm per PRS 483
+    checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
 #endif
 }