Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r261cfc6d93996e76e26c1e9c3f5740077ad2ec22 -r45fe3b732b4fb769f7788bef699a8dd34b250425
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 261cfc6d93996e76e26c1e9c3f5740077ad2ec22)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 45fe3b732b4fb769f7788bef699a8dd34b250425)
@@ -7,8 +7,8 @@
 *
 * @file    ROPump.h
 *
-* @author  (last)      Bill Bracken
-* @date    (last)      22-Aug-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      26-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -37,13 +37,12 @@
 /// RO pump data struct.
 typedef struct
 {
-    F32 roPumpTgtPressure;                      ///< RO pump target pressure.
-    F32 measROFlowRate;                         ///< RO flow rate measurement.
+    F32 roPumpTgtPressurePSI;                   ///< RO pump target pressure.
+    F32 roMeasFlowRateLPM;                      ///< RO pump measured flow rate
     F32 roPumpDutyCycle;                        ///< RO pump duty cycle.
     U32 roPumpState;                            ///< RO pump current state.
-    F32 roPumpTgtFlowRateLM;                    ///< RO pump target flow rate in L/min
+    F32 roPumpTgtFlowRateLPM;                   ///< RO pump target flow rate in L/min.
     F32 roPumpFBDutyCycle;                      ///< RO pump feedback duty cycle.
-    F32 roPumpMeasFlowWithConcPumps;            ///< RO pump measured flow with the concentrate pumps.
 } RO_PUMP_DATA_T;
 
 // ********** public function prototypes **********
@@ -52,8 +51,6 @@
 void execROPumpMonitor( void );
 void execROPumpController( void );
 
-SELF_TEST_STATUS_T execROPumpSelfTest( void );
-
 BOOL setROPumpTargetFlowRateLPM( F32 roFlowRate, U32 maxPressure );
 BOOL setROPumpTargetFlowRateDelayed( F32 roFlowRate, U32 maxPressure, U32 delayMs );
 
@@ -62,20 +59,14 @@
 BOOL isROPumpRunning( void );
 
 F32  getTargetROPumpFlowRateLPM( void );
-F32  getMeasuredROFlowRateLPM( void );
-F32  getMeasuredROFlowRateWithConcPumpsLPM( void );
+F32  getTargetROPumpPressurePSI( void );
 
-F32  getTargetROPumpPressure( void );
-
 F32  getROGeneratedVolumeL( void );
 void resetROGenerateVolumeL( void );
 
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value );
 BOOL testResetROPumpDataPublishIntervalOverride( void );
 
-BOOL testSetMeasuredROFlowRateOverride( F32 value );
-BOOL testResetMeasuredROFlowRateOverride( void );
-
 BOOL testSetTargetROPumpFlow( F32 flow );
 
 BOOL testSetTargetROPumpPressure( U32 value );