Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -r43fdad4b6224c0bf73f3449d174854cf720773ad
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 43fdad4b6224c0bf73f3449d174854cf720773ad)
@@ -39,9 +39,9 @@
 #define COND_CPI_SENSOR_PROBE_TYPE                      100                                         ///< 1 K cell constant conductivity probe.
 #define COND_CPO_SENSOR_PROBE_TYPE                      10                                          ///< 0.1 K cell constant conductivity probe.
 
-#define COND_SENSOR_DECIMAL_CONVERSION                  100                                         ///< Conductivity value from FPGA has two decimal place.
+#define COND_SENSOR_DECIMAL_CONVERSION                  100.0F                                      ///< Conductivity value from FPGA has two decimal place.
 #define COND_SENSOR_TEMPERATURE_COEF                    0.02F                                       ///< Linear temperature coefficient of variation at 25 Celcius for fresh water.
-#define COND_SENSOR_REFERENCE_TEMPERATURE               25                                          ///< Reference temperature for conductivity sensor.
+#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.
@@ -56,7 +56,7 @@
 
 #define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE           1.0F                                        ///< Out of range value for RO rejection ratio when CPi conductivity is zero.
 #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 MAX_CPO_CONDUCTIVITY_ALLOW                      30.0F                                       ///< Maximum CPo sensor conductivity value.
 
 #define COND_SENSOR_PERSISTENCE_PERIOD                  ( 5 * MS_PER_SECOND )                       ///< Persistence period for conductivity sensor out of range error.
 #define RO_REJECTION_RATIO_PERSISTENCE_PERIOD           ( 10 * MS_PER_SECOND )                      ///< Persistence period for RO rejection ratio.
@@ -153,7 +153,6 @@
     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_HIGH_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 );
@@ -295,15 +294,18 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RO_RATIO_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        F32 cpo                    = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-        BOOL isRORectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
-        BOOL isCPoOutOfRange       = ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ? TRUE : FALSE );
+        F32 cpo                      = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
+        BOOL isRORejectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
+        BOOL isCPoOutOfRange         = ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ? TRUE : FALSE );
 
+//        printf("%s- isRORejectionOutOfRange: %d, %f, %f\n", __func__, isRORejectionOutOfRange, MAX_RO_REJECTION_RATIO_ALLOW, cpo );       // WJB
+//        printf("%s- isCPoOutOfRange: %d, %f, %f\n", __func__, isCPoOutOfRange, MAX_CPO_CONDUCTIVITY_ALLOW, cpo);                             //WJb
+
         // Fault alarm per PRS 483
         checkPersistentAlarm( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, isCPoOutOfRange, cpo, MAX_CPO_CONDUCTIVITY_ALLOW );
 
         // Fault alarm per PRS 483
-        checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
+        checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORejectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
     }
 }
 
@@ -370,9 +372,12 @@
     {
         roRejectionRatio = cpo / cpi;
     }
+
+//    printf("%s- cpi: %f, cpo: %f, roRejectionRatio: %f\n", __func__, cpi, cpo, roRejectionRatio);       // WJB
+
 }
 
-/*********************************************************************//**
+/***********************************************************************
  * @brief
  * The processCPiCPoSensorRead function checks if there is an error in FPGA
  * and FPGA read count. If there is any error in the FPGA error, it raises an
@@ -396,10 +401,15 @@
             F32 conductivity  = ( (F32)( fgpaRead ) / COND_SENSOR_DECIMAL_CONVERSION );
             F32 compensatedCond = calcCompensatedConductivity( conductivity, temperature );
 
+            printf("%s- temp: %f, conductivity: %f, compCond: %f\n", __func__, temperature, conductivity, compensatedCond);
+
             readCount[ sensorId ] = fpgaReadCount;
             internalErrorCount[ sensorId ] = 0;
             compensatedConductivityValues[ sensorId ].data = getCalibrationAppliedConductivityValue( sensorId, compensatedCond );
             rawConductivityValues[ sensorId ] = conductivity;  // store raw conductivity data from CPi and CPo
+
+//            printf("%s- sensorId: %d, readCount: %d, compCondValues: %f,\n", __func__, sensorId, readCount[ sensorId ],
+//                   compensatedConductivityValues[ sensorId ].data);     //wjb
         }
         else
         {