Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r3461c140ba07e74863dee1d4c51d0119076fecf8 -rc31c6e4340c28577df4d146165ccbfc8f0a47134
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 3461c140ba07e74863dee1d4c51d0119076fecf8)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c31c6e4340c28577df4d146165ccbfc8f0a47134)
@@ -38,8 +38,8 @@
 
 #define FILL_MIN_RO_FLOW_RATE                           0.6                                         ///< Minimum RO flow rate in fill mode.
 #define FILL_MAX_RO_FLOW_RATE                           1.0                                         ///< Maximum RO flow rate in fill mode.
-#define FILL_TARGET_RO_FLOW_RATE                        0.8                                         ///< Target RO flow rate in fill mode.
-#define FILL_TARGET_RO_PRESSURE_PSI                     120                                         ///< Target RO pressure in fill mode.
+#define TARGET_RO_PRESSURE_PSI                          130                                         ///< Target pressure for RO pump.
+#define TARGET_RO_FLOW_RATE_L                           0.8                                         ///< Target flow rate for RO pump.
 #define RO_FLOW_RATE_OUT_OF_RANGE_PERSISTENCE_PERIOD    ( 5 * MS_PER_SECOND )                       ///< Persistence period for RO flow rate out of range.
 
 #define DIALYSATE_ACID_CONCENTRATE_RATIO                ( 2.35618 / FRACTION_TO_PERCENT_FACTOR )    ///< Ratio between RO water and acid concentrate.
@@ -71,8 +71,9 @@
 {
     fillState = DG_FILL_MODE_STATE_START;
 
-    initPersistentAlarm( PERSISTENT_ALARM_RO_PUMP_FLOW_RATE_OUT_OF_RANGE, ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE,
-                         FALSE, RO_FLOW_RATE_OUT_OF_RANGE_PERSISTENCE_PERIOD, RO_FLOW_RATE_OUT_OF_RANGE_PERSISTENCE_PERIOD );
+    // TODO figure this out
+    //initPersistentAlarm( PERSISTENT_ALARM_RO_PUMP_FLOW_RATE_OUT_OF_RANGE, ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE,
+    //                     FALSE, RO_FLOW_RATE_OUT_OF_RANGE_PERSISTENCE_PERIOD, RO_FLOW_RATE_OUT_OF_RANGE_PERSISTENCE_PERIOD );
 }
 
 /*********************************************************************//**
@@ -168,10 +169,9 @@
         // Concentrate pumps on request and set RO pump to flow rate 800 mL/min
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1 );
         requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2 );
-        // TODO: Change to set flow rate once RO pump driver is updated
-        // setROPumpFlowRate( FILL_TARGET_RO_FLOW_RATE );
-        setROPumpTargetPressure( FILL_TARGET_RO_PRESSURE_PSI, PUMP_CONTROL_MODE_CLOSED_LOOP );
 
+        setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+
         result = DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION;
     }
 
@@ -268,7 +268,7 @@
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2, bicarbCP2PumpFlowRate );
 
     BOOL const isROPumpFlowRateOutOfRange = ( measuredROFlowRate <= FILL_MIN_RO_FLOW_RATE ) || ( measuredROFlowRate >= FILL_MAX_RO_FLOW_RATE );
-    checkPersistentAlarm( PERSISTENT_ALARM_RO_PUMP_FLOW_RATE_OUT_OF_RANGE, isROPumpFlowRateOutOfRange, measuredROFlowRate );
+    //checkPersistentAlarm( PERSISTENT_ALARM_RO_PUMP_FLOW_RATE_OUT_OF_RANGE, isROPumpFlowRateOutOfRange, measuredROFlowRate ); TODO figure this out
 }
 
 /**@}*/