Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -ra52e41cc2219362d433149ca034908c8763d8378 -rbbf1e3736be03a4f041ace57e0f95e23caf472dd
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision a52e41cc2219362d433149ca034908c8763d8378)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
@@ -81,7 +81,7 @@
  *************************************************************************/
 void execReservoirs( void )
 {
-    // TODO - publish active reservoir, fill/drain volume targets at 1 Hz.
+    // publish active reservoir, fill/drain volume targets at 1 Hz.
     if ( ++reservoirDataPublicationTimerCounter >= RESERVOIR_DATA_PUB_INTERVAL )
     {
         U32 actRes = getActiveReservoir();
@@ -114,19 +114,19 @@
             case RESERVOIR_1:
                 activeReservoir.data = (U32)resID;
                 result = TRUE;
-                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 );
+                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 );
                 break;
 
             case RESERVOIR_2:
                 activeReservoir.data = (U32)resID;
                 result = TRUE;
-                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-                setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-                setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
-                setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+                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 );
                 break;
 
             default:
@@ -305,11 +305,11 @@
  *************************************************************************/
 U32 getReservoirFillVolumeTargetMl( void )
 {
-    U32 result = (RESERVOIR_ID_T)fillVolumeTargetMl.data;
+    U32 result = fillVolumeTargetMl.data;
 
     if ( OVERRIDE_KEY == fillVolumeTargetMl.override )
     {
-        result = (RESERVOIR_ID_T)fillVolumeTargetMl.ovData;
+        result = fillVolumeTargetMl.ovData;
     }
 
     return result;
@@ -326,11 +326,11 @@
  *************************************************************************/
 U32 getReservoirDrainVolumeTargetMl( void )
 {
-    U32 result = (RESERVOIR_ID_T)drainVolumeTargetMl.data;
+    U32 result = drainVolumeTargetMl.data;
 
     if ( OVERRIDE_KEY == drainVolumeTargetMl.override )
     {
-        result = (RESERVOIR_ID_T)drainVolumeTargetMl.ovData;
+        result = drainVolumeTargetMl.ovData;
     }
 
     return result;