Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -re4b79bd0d31e779619a787f9ce4352d0fd3d4dce -ra1b8dbb69c4bd2f0cc22e62bede7015c9307d378
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision e4b79bd0d31e779619a787f9ce4352d0fd3d4dce)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a1b8dbb69c4bd2f0cc22e62bede7015c9307d378)
@@ -21,6 +21,7 @@
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
+#include "ROPump.h"
 #include "TaskGeneral.h"
 #include "TemperatureSensors.h"
 #include "Valves.h"
@@ -32,12 +33,15 @@
 
 // ********** private definitions **********
 
-#define TARGET_DRAIN_PUMP_RPM           2800                                                ///< Target drain pump speed (in RPM).
-#define DRAIN_WEIGH_UNCHANGE_TIMEOUT    ( 10 * MS_PER_SECOND )                              ///< Time period of unchanged weight during draining before timeout.
+#define TARGET_DRAIN_PUMP_RPM           1800                                ///< Target drain pump speed (in RPM).
+#define DRAIN_WEIGH_UNCHANGE_TIMEOUT    ( 2 * MS_PER_SECOND )               ///< Time period of unchanged weight during draining before timeout.
 
+#define TARGET_RO_PRESSURE_PSI          130                                 ///< Target pressure for RO pump.
+#define TARGET_RO_FLOW_RATE_L           0.3                                 ///< Target flow rate for RO pump.
+
 // ********** private data **********
 
-static DG_DRAIN_STATE_T drainState = DG_DRAIN_STATE_START;                                  ///< Currently active drain state.
+static DG_DRAIN_STATE_T drainState = DG_DRAIN_STATE_START;                  ///< Currently active drain state.
 
 // ********** private function prototypes **********
 
@@ -70,6 +74,7 @@
     // set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setDrainPumpTargetRPM( TARGET_DRAIN_PUMP_RPM );
+    setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
 }
 
 /*********************************************************************//**
@@ -99,7 +104,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, drainState ) // TODO - add s/w fault enum to 1st data param
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE, drainState )
             drainState = DG_DRAIN_STATE_START;
             break;
     }
@@ -117,7 +122,7 @@
 static DG_DRAIN_STATE_T handleDrainState( void )
 {
     DG_DRAIN_STATE_T result = DG_DRAIN_STATE_DRAIN;
-    RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
+    DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
     // if we have reached our target drain to volume (by weight) or cannot drain anymore, we are done draining - go back to re-circ mode
     if ( hasTargetDrainVolumeBeenReached( inactiveReservoir, DRAIN_WEIGH_UNCHANGE_TIMEOUT ) )