Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r9826fc85bd1497ec617ae0e825f78b91972de2b3 -r971fc9950b919f8b54ff88a627f6cb1e8a0906ee
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 9826fc85bd1497ec617ae0e825f78b91972de2b3)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 971fc9950b919f8b54ff88a627f6cb1e8a0906ee)
@@ -7,8 +7,8 @@
 *
 * @file    ConductivitySensors.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Aug-2022
+* @author  (last)      Bill Bracken
+* @date    (last)      22-Aug-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  13-Jul-2020
@@ -40,9 +40,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.
@@ -57,7 +57,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.
@@ -327,15 +327,15 @@
     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 );
 
         // 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 );
     }
 }
 
@@ -405,6 +405,7 @@
     {
         roRejectionRatio = cpo / cpi;
     }
+
 }
 
 /*********************************************************************//**