Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rafb8316aee80115f0e0712a31a12adbd39a9cedf -re63a226f9b88b706ccdbb91358b7aaadfabd095c
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision afb8316aee80115f0e0712a31a12adbd39a9cedf)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e63a226f9b88b706ccdbb91358b7aaadfabd095c)
@@ -67,7 +67,7 @@
 #define BICARB_SENSORS_ALPHA_LOW                            0.0211F                                     ///< Temp compensated low alpha value for D17 and D74.
 #define BICARB_SENSORS_ALPHA_HIGH                           0.0228F                                     ///< Temp compensated high alpha value for D17 and D74.
 #define RO_SENSORS_ALPHA                                    0.02F                                       ///< Temp compensated alpha value for P9, P18 with RO water.
-#define TEMP_COMP_LINEAR(slope, intercept, temp) ( ( slope * temp ) + intercept )                       ///< Line equation for temp
+#define TEMP_COMP_LINEAR(slope, intercept, temp)            ( ( slope * temp ) + intercept )            ///< Line equation for temp
 
 #define COND_TEMP_OFFSET                                    25                                          ///< Temperature offset constant used in RTD calculations.
 #define SIEMENS_TO_MICROSIEMENS_CONVERSION                  1000000.0F                                  ///< Siemens to microSiemens conversion factor.
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rafb8316aee80115f0e0712a31a12adbd39a9cedf -re63a226f9b88b706ccdbb91358b7aaadfabd095c
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision afb8316aee80115f0e0712a31a12adbd39a9cedf)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e63a226f9b88b706ccdbb91358b7aaadfabd095c)
@@ -66,29 +66,29 @@
 
 // ********** private data **********
 
-static U08 condPrevReadCount[ NUM_OF_CONDUCTIVITY_SENSORS ];                                                            ///< Previous read count for conductivity per sensor
-static U08 condTempPrevReadCount[ NUM_OF_CONDUCTIVITY_SENSORS ];                                                        ///< Previous read count for temperature per sensor.
-static FILTER_CONDUCTIVITY_READINGS_T filteredConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                      ///< Filtered conductivity reading for conductivity sensors.
-static FILTER_CONDUCTIVITY_READINGS_T filteredUConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];
-static OVERRIDE_F32_T filteredcurrentUConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];
-static OVERRIDE_F32_T filteredcurrentConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                               ///< filtered current conductivity sensor conductivity readings (overrideable).
-static FILTER_CONDUCTIVITY_TEMPERATURE_READINGS_T filteredConductivityTemperatureReadings[ NUM_OF_CONDUCTIVITY_SENSORS ]; ///< Filtered temperature reading for conductivity sensors.
-static OVERRIDE_F32_T filteredcurrentTemperatureReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                                ///< filtered current conductivity sensor temperature readings (overrideable).
-static U32 ddConductivityPublishTimerCounter;                                                                           ///< DD Conductivity data publication counter.
-static OVERRIDE_U32_T ddConductivityDataPublishInterval;                                                                ///< DD Conductivity sensors publish time interval override.
-static U32 fpConductivityPublishTimerCounter;                                                                           ///< FP Conductivity data publication counter.
-static OVERRIDE_U32_T fpConductivityDataPublishInterval;                                                                ///< FP Conductivity sensors publish time interval override.
-static F32 roRejectionRatio;                                                                                            ///< All time RO rejection ratio.
-static F32 roRejectionRatioTankFill;                                                                                    ///< RO rejection ratio during permeate tank fill state.
-static U32 roRRPublishTimerCounter;                                                                                     ///< RO rejection ratio publication counter.
-static OVERRIDE_U32_T roRRDataPublishInterval;                                                                          ///< RO rejection ratio publish time interval override.
-static OVERRIDE_F32_T roRRAvg;                                                                                          ///< Average RO rejection ratio.
-static F32 roRRRunningSum;                                                                                              ///< RO rejection ratio running sum.
-static F32 roRRSamples[ RO_RR_MOVING_AVG_NUM_OF_SAMPLES ];                                                              ///< RO rejection ratio samples array.
-static U32 roRRSamplesNextIndex;                                                                                        ///< RO rejection ratio sample next index number.
-static U32 roRRCount;                                                                                                   ///< RO rejection ratio Number of samples in average buffer.
-static F32 roRRTankFillAvg;                                                                                             ///< Average RO rejection ratio during permeate tank fill state.
-static U32 roRRSampleIntervalCounter;                                                                                   ///< RO rejection ratio sample collection timer counter.
+static U08 condPrevReadCount[ NUM_OF_CONDUCTIVITY_SENSORS ];                                                                ///< Previous read count for conductivity per sensor
+static U08 condTempPrevReadCount[ NUM_OF_CONDUCTIVITY_SENSORS ];                                                            ///< Previous read count for temperature per sensor.
+static FILTER_CONDUCTIVITY_READINGS_T filteredConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                          ///< Filtered conductivity reading for conductivity sensors.
+static FILTER_CONDUCTIVITY_READINGS_T filteredUConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                         ///< Filtered conductivity readings without temperature compensation
+static OVERRIDE_F32_T filteredcurrentUConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                                  ///< Filtered current conductivity sensor conductivity readings (overrideable).
+static OVERRIDE_F32_T filteredcurrentConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                                   ///< Filtered current conductivity sensor conductivity readings (overrideable).
+static FILTER_CONDUCTIVITY_TEMPERATURE_READINGS_T filteredConductivityTemperatureReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];   ///< Filtered temperature reading for conductivity sensors.
+static OVERRIDE_F32_T filteredcurrentTemperatureReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                                    ///< filtered current conductivity sensor temperature readings (overrideable).
+static U32 ddConductivityPublishTimerCounter;                                                                               ///< DD Conductivity data publication counter.
+static OVERRIDE_U32_T ddConductivityDataPublishInterval;                                                                    ///< DD Conductivity sensors publish time interval override.
+static U32 fpConductivityPublishTimerCounter;                                                                               ///< FP Conductivity data publication counter.
+static OVERRIDE_U32_T fpConductivityDataPublishInterval;                                                                    ///< FP Conductivity sensors publish time interval override.
+static F32 roRejectionRatio;                                                                                                ///< All time RO rejection ratio.
+static F32 roRejectionRatioTankFill;                                                                                        ///< RO rejection ratio during permeate tank fill state.
+static U32 roRRPublishTimerCounter;                                                                                         ///< RO rejection ratio publication counter.
+static OVERRIDE_U32_T roRRDataPublishInterval;                                                                              ///< RO rejection ratio publish time interval override.
+static OVERRIDE_F32_T roRRAvg;                                                                                              ///< Average RO rejection ratio.
+static F32 roRRRunningSum;                                                                                                  ///< RO rejection ratio running sum.
+static F32 roRRSamples[ RO_RR_MOVING_AVG_NUM_OF_SAMPLES ];                                                                  ///< RO rejection ratio samples array.
+static U32 roRRSamplesNextIndex;                                                                                            ///< RO rejection ratio sample next index number.
+static U32 roRRCount;                                                                                                       ///< RO rejection ratio Number of samples in average buffer.
+static F32 roRRTankFillAvg;                                                                                                 ///< Average RO rejection ratio during permeate tank fill state.
+static U32 roRRSampleIntervalCounter;                                                                                       ///< RO rejection ratio sample collection timer counter.
 
 // ********** private function prototypes **********
 
@@ -625,9 +625,9 @@
 
         broadcastData( MSG_ID_FP_RO_REJECTION_RATIO_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( RO_REJECTION_RATIO_DATA_T ) );
     }
-
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -rafb8316aee80115f0e0712a31a12adbd39a9cedf -re63a226f9b88b706ccdbb91358b7aaadfabd095c
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision afb8316aee80115f0e0712a31a12adbd39a9cedf)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision e63a226f9b88b706ccdbb91358b7aaadfabd095c)
@@ -72,8 +72,8 @@
     F32 p18CondResist;                                      ///< P18 raw resistance value from conductivity
     F32 p9RTDResist;                                        ///< P9 raw resistance value from RTD
     F32 p18RTDResist;                                       ///< P18 raw resistance value from RTD
-    F32 p9CondUncomp;                                     ///< P9 conductivity sensor value without temperature compensation
-    F32 p18CondUncomp;                                    ///< P18 conductivity sensor value without temperature compensation
+    F32 p9CondUncomp;                                       ///< P9 conductivity sensor value without temperature compensation
+    F32 p18CondUncomp;                                      ///< P18 conductivity sensor value without temperature compensation
 } FP_CONDUCTIVITY_DATA_T;
 
 /// RO rejection ratio data struct.