Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -rc5e1315bfeb11335f66f7439e00857f26649e25b
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 8f5feed92f41a476d5656038bcdfe884e17bd593)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c5e1315bfeb11335f66f7439e00857f26649e25b)
@@ -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                         0                                       ///> 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.
 
@@ -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:
@@ -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 );