Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -39,7 +39,7 @@
 #define MAX_FILL_VOLUME_ML                          MAX_RESERVOIR_VOLUME_ML                 ///> Maximum fill volume in mL.
 #define DEFAULT_DRAIN_VOLUME_ML                     100                                     ///> Default drain volume in mL.
 #define MAX_DRAIN_VOLUME_ML                         MAX_RESERVOIR_VOLUME_ML                 ///> Maximum drain volume in mL.
-#define MIN_DRAIN_VOLUME_ML                         20                                      ///> Minimum drain volume in mL.
+#define MIN_DRAIN_VOLUME_ML                         100                                     ///> Minimum drain volume in mL.
 
 #define RESERVOIR_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )  ///< interval (ms/task time) at which the reservoir data is published on the CAN bus.
 
@@ -100,7 +100,7 @@
  * @details
  * Inputs : none
  * Outputs : Specified reservoir is set as active.
- * @param resID : ID of reservoir to set as active.
+ * @param resID ID of reservoir to set as active
  * @return TRUE if set active reservoir command successful, FALSE if not.
  *************************************************************************/
 BOOL setActiveReservoirCmd( RESERVOIR_ID_T resID )
@@ -115,33 +115,19 @@
             case RESERVOIR_1:
                 activeReservoir.data = (U32)resID;
                 result = TRUE;
-#ifndef BETA_V1_BUILD
                 setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
                 setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
                 setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
-#else
-                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );       // TODO - valve states are reversed for the two reservoirs for now - revert back when load cells are fixed.
-                setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-                setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
-                setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
-#endif
                 break;
 
             case RESERVOIR_2:
                 activeReservoir.data = (U32)resID;
                 result = TRUE;
-#ifndef BETA_V1_BUILD
                 setValveState( VRF, VALVE_STATE_R1_C_TO_NC );       // TODO - valve states are reversed for the two reservoirs for now - revert back when load cells are fixed.
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
                 setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
                 setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
-#else
-                setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-                setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
-                setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
-                setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
-#endif
                 break;
 
             default:
@@ -159,7 +145,7 @@
  * @details
  * Inputs : none
  * Outputs : move to fill mode
- * @param fillToVolMl : Target volume (in mL) to fill reservoir to.
+ * @param fillToVolMl Target volume (in mL) to fill reservoir to
  * @return TRUE if fill command successful, FALSE if not.
  *************************************************************************/
 BOOL startFillCmd( U32 fillToVolMl )
@@ -211,7 +197,7 @@
  * @details
  * Inputs : none
  * Outputs :
- * @param drainToVolMl : Target volume (in mL) to drain reservoir to.
+ * @param drainToVolMl Target volume (in mL) to drain reservoir to
  * @return TRUE if drain command successful, FALSE if not.
  *************************************************************************/
 BOOL startDrainCmd( U32 drainToVolMl )
@@ -222,7 +208,7 @@
     if ( DG_MODE_CIRC == getCurrentOperationMode() )
     {
         // validate parameters
-        if ( ( drainToVolMl > MIN_DRAIN_VOLUME_ML ) && ( drainToVolMl < MAX_DRAIN_VOLUME_ML ) )
+        if ( ( drainToVolMl >= MIN_DRAIN_VOLUME_ML ) && ( drainToVolMl <= MAX_DRAIN_VOLUME_ML ) )
         {
             drainVolumeTargetMl.data = drainToVolMl;
             requestNewOperationMode( DG_MODE_DRAI );
@@ -371,7 +357,7 @@
  * @details
  * Inputs : activeReservoir
  * Outputs : activeReservoir
- * @param value : override active reservoir ID.
+ * @param value override active reservoir ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetDGActiveReservoirOverride( RESERVOIR_ID_T value )
@@ -418,7 +404,7 @@
  * @details
  * Inputs : fillVolumeTargetMl
  * Outputs : fillVolumeTargetMl
- * @param value : override target reservoir fill volume (in mL)
+ * @param value override target reservoir fill volume (in mL)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetReservoirFillVolumeMlOverride( U32 value )
@@ -465,7 +451,7 @@
  * @details
  * Inputs : drainVolumeTargetMl
  * Outputs : drainVolumeTargetMl
- * @param value : override target reservoir drain volume (in mL)
+ * @param value override target reservoir drain volume (in mL)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetReservoirDrainVolumeMlOverride( U32 value )