Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -rab304e2ca6e3e40ed8cb12650e9855ae0b9649d8
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision ab304e2ca6e3e40ed8cb12650e9855ae0b9649d8)
@@ -29,30 +29,35 @@
  */
 
 // ********** public definitions **********
+#define MAX_RO_FLOWRATE_LPM             1.2            ///< Maximum target RO flow rate (in LPM)
+#define MIN_RO_FLOWRATE_LPM             0.2            ///< Minimum target RO flow rate (in LPM)
 
-#define MAX_RO_PRESSURE                 140             ///< Maximum target RO outlet pressure (in PSI).
-#define MIN_RO_PRESSURE                 100             ///< Minimum target RO outlet pressure (in PSI).
-
 // ********** public function prototypes **********
 
 void initROPump( void );
 void execROPumpMonitor( void );
 void execROPumpController( void );
 
-BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode );
+BOOL setROPumpTargetFlowRate( F32 roFlowRate );
+BOOL setROPumpTargetPWM( U32 pwm );
 void signalROPumpHardStop( void );
 
 BOOL isReverseOsmosisPumpOn( void );
 
 SELF_TEST_STATUS_T execROPumpTest( void );
-
-U32 getTargetROPumpPressure( void );
-F32 getMeasuredROFlowRate( void );
 
+DATA_GET_PROTOTYPE( F32, getTargetROPumpFlowRate );
+DATA_GET_PROTOTYPE( F32, getMeasuredROFlowRate );
+
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value );
 BOOL testResetROPumpDataPublishIntervalOverride( void );
-BOOL testSetTargetROPumpPressureOverride( U32 value );
+
+BOOL testSetTargetROPumpFlowRateOverride( F32 value );
+BOOL testResetTargetROPumpFlowRateOverride( void );
+
+BOOL testSetTargetROPumpPressureOverride( U32 value );
 BOOL testResetTargetROPumpPressureOverride( void );
+
 BOOL testSetMeasuredROFlowRateOverride( F32 value );
 BOOL testResetMeasuredROFlowRateOverride( void );