Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -r39405d73782b8b9cf1fc26238640e683efcebbb5
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 39405d73782b8b9cf1fc26238640e683efcebbb5)
@@ -33,6 +33,9 @@
 
 // ********** public definitions **********
 
+#define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE        100.0F   ///< Out of range value for RO rejection ratio when CPi conductivity is zero.
+
+#pragma pack(push, 1)
 /// Conductivity data struct.
 typedef struct
 {
@@ -50,19 +53,36 @@
     F32 p18Conductivity;                                      ///< (P18) conductivity sensor value
 } FP_CONDUCTIVITY_DATA_T;
 
+/// RO rejection ratio data struct.
+typedef struct
+{
+    F32 rawRORejectionRatio;                                 ///< RO rejection ratio during tank full and fill state
+    F32 rawRORejectionRatioTankFill;                         ///< RO rejection ratio during tank fill state
+    F32 avgRORejectionRatio;                                 ///< RO rejection ratio average during tank full and fill state
+    F32 avgRORejectionRatioTankFill;                         ///< RO rejection ratio average during tank fill state
+    U32 genPermeateState;                                    ///< Permeate tank state
+} RO_REJECTION_RATIO_DATA_T;
+#pragma pack(pop)
+
 // ********** public function prototypes **********
 
 void initConductivity( void );
 void execConductivity( void );
 F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor );
 F32 getFilteredConductivitySensorTemperature( CONDUCTIVITY_SENSORS_T sensor );
+F32 getRORejectonRatio( void );
+F32 getTankFillRORejectionRatio( void );
+F32 getRORRAverage( void );
+F32 getTankFillRORRAverage( void );
 
 BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );
 BOOL testDDConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message );
 
 /**@}*/