Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rf656b17f3d8d93b4fca49c9725e096e7eb55acc7 -r1a5efe97f5f39594b45797fded52cafce92afe80
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision f656b17f3d8d93b4fca49c9725e096e7eb55acc7)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
@@ -129,31 +129,31 @@
         {
             case DG_RESERVOIR_1:
                 activeReservoir.data = (U32)resID;
-                cmdResponse.rejected = FALSE;
-                setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+                cmdResponse.rejected = FALSE;
+                setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 #ifndef V_2_SYSTEM
-                setValveState( VRD1, VALVE_STATE_CLOSED );
+                setValveState( VRD1, VALVE_STATE_OPEN );
 #else
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
 #endif
-                setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
-                setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
-                break;
-
-            case DG_RESERVOIR_2:
+                setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+                setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+                break;
+
+            case DG_RESERVOIR_2:
                 activeReservoir.data = (U32)resID;
-                cmdResponse.rejected = FALSE;
-                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
+                cmdResponse.rejected = FALSE;
+                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
 #ifndef V_2_SYSTEM
-                setValveState( VRD2, VALVE_STATE_CLOSED );
+                setValveState( VRD2, VALVE_STATE_OPEN );
 #else
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
 #endif
-                setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
-                setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
-                break;
-
-            default:
+                setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+                setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+                break;
+
+            default:
                 // invalid reservoir given - cmd will be NAK'd w/ false result.
                 cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
                 break;
@@ -461,6 +461,7 @@
     if ( ( TRUE == hasTimeOut ) || ( ( TRUE == hasTargetReached ) && ( FALSE == tareLoadCellRequest ) ) )
     {
         result = TRUE;
+        // Reset for next drain
         reservoirLowestWeight[ reservoirId ] = MAX_RESERVOIR_WEIGHT;
 
         if ( TRUE == tareLoadCellRequest )
@@ -476,6 +477,38 @@
 
 /*********************************************************************//**
  * @brief
+ * The tareLoadCellsAtEmpty function tares the load cells for the given
+ * reservoir when empty and tare request is pending.
+ * @details Inputs: tareLoadCellRequest
+ * @details Outputs: tareLoadCellRequest
+ * @param reservoirId ID of reservoir to tare
+ * @return none
+ *************************************************************************/
+void tareLoadCellsAtEmpty( DG_RESERVOIR_ID_T reservoirId )
+{
+    if ( TRUE == tareLoadCellRequest )
+    {
+        tareLoadCellRequest = FALSE;
+        tareLoadCell( associatedLoadCell[ reservoirId ] );
+        tareLoadCell( redundantLoadCell[ reservoirId ] );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The isReservoirTarePending function determines whether a reservoir tare
+ * request is currently pending.
+ * @details Inputs: tareLoadCellRequest
+ * @details Outputs: none
+ * @return tareLoadCellRequest
+ *************************************************************************/
+BOOL isReservoirTarePending( void )
+{
+    return tareLoadCellRequest;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getActiveReservoir function gets the active reservoir.
  * @details Inputs: activeReservoir
  * @details Outputs: none