Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r2510a84808ee5179d3f84f0b04f24c5a4122dbe5 -r1d235091e158221f1fa8b1579140905a13249a54
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 2510a84808ee5179d3f84f0b04f24c5a4122dbe5)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 1d235091e158221f1fa8b1579140905a13249a54)
@@ -29,35 +29,28 @@
  */
 
 // ********** 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). //TODO remove
-#define MIN_RO_PRESSURE                 100             ///< Minimum target RO outlet pressure (in PSI). //TODO remove
-
-#define MAX_RO_FLOWRATE_LPM                 1.2            //TODO dara
-#define MIN_RO_FLOWRATE_LPM                 0.2             //TODO dara
-
 // ********** public function prototypes **********
 
 void initROPump( void );
 void execROPumpMonitor( void );
 void execROPumpController( void );
 
-BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode ); //TODO remove
-
-BOOL setROPumpTargetFlowRate( F32 roFlowRate );
+BOOL setROPumpTargetFlowRate( F32 roFlowRate );
+BOOL setROPumpTargetPWM( U32 pwm );
 void signalROPumpHardStop( void );
 
 BOOL isReverseOsmosisPumpOn( void );
 
 SELF_TEST_STATUS_T execROPumpTest( void );
 
-DATA_GET_PROTOTYPE( F32, getTargetROPumpFlowRate ); //TODO change the header
-DATA_GET_PROTOTYPE( F32, getMeasuredROFlowRate ); //TODO change the header
+DATA_GET_PROTOTYPE( F32, getTargetROPumpFlowRate );
+DATA_GET_PROTOTYPE( F32, getMeasuredROFlowRate );
 
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value );
 BOOL testResetROPumpDataPublishIntervalOverride( void );
-BOOL testSetTargetROPumpPressureOverride( U32 value ); //TODO remove
-BOOL testResetTargetROPumpPressureOverride( void ); //TODO remove
 
 BOOL testSetTargetROPumpFlowRateOverride( F32 value );
 BOOL testResetTargetROPumpFlowRateOverride( void );