Index: firmware/App/Controllers/PistonPumpControl.c
===================================================================
diff -u -r95e32e6462b952f744f77c7e56f00bffdf8ec5bd -rb730ab3a8e576e5b35e4c2ff7828064bdd48d9a0
--- firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision 95e32e6462b952f744f77c7e56f00bffdf8ec5bd)
+++ firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision b730ab3a8e576e5b35e4c2ff7828064bdd48d9a0)
@@ -71,7 +71,7 @@
 
 // ********** private function prototypes **********
 
-static void pistonPumpInletOutletValveControl( PISTON_PUMPS_T pumpId, BOOL inletValveState, BOOL outletValveState );
+static void pistonPumpInletOutletValveControl( PISTON_PUMPS_T pumpId, VALVE_STATE_NAMES_T inletValveState, VALVE_STATE_NAMES_T outletValveState );
 static PISTON_PUMP_EXEC_STATE_T handlePistonPumpOffState( PISTON_PUMPS_T pumpId );
 static PISTON_PUMP_EXEC_STATE_T handlePistonPumpFillStartState( PISTON_PUMPS_T pumpId );
 static PISTON_PUMP_EXEC_STATE_T handlePistonPumpFillCompleteState( PISTON_PUMPS_T pumpId );
@@ -179,26 +179,26 @@
  * @param outletValveState Outlet Valve open/close state
  * @return none.
  *************************************************************************/
-static void pistonPumpInletOutletValveControl( PISTON_PUMPS_T pumpId, BOOL inletValveState, BOOL outletValveState )
+static void pistonPumpInletOutletValveControl( PISTON_PUMPS_T pumpId, VALVE_STATE_NAMES_T inletValveState, VALVE_STATE_NAMES_T outletValveState )
 {
     switch ( pumpId )
     {
         case PISTONPUMPS_ACID:
             // Valves assocaited to Acid concentrate Pumps
-            setValveState( VHO, (VALVE_STATE_NAMES_T)inletValveState );
-            setValveState( VTD, (VALVE_STATE_NAMES_T)outletValveState );
+            setValveState( VHO, inletValveState );
+            setValveState( VTD, outletValveState );
             break;
 
         case PISTONPUMPS_BICARB:
             // Valves assocaited to Bicarb concentrate Pumps
-            setValveState( UFO1, (VALVE_STATE_NAMES_T)inletValveState );
-            setValveState( UFO2, (VALVE_STATE_NAMES_T)outletValveState );
+            setValveState( UFO1, inletValveState );
+            setValveState( UFO2, outletValveState );
             break;
 
         case PISTONPUMPS_UF:
             // Valves assocaited to Ultrafilteration
-            setValveState( UF1, (VALVE_STATE_NAMES_T)inletValveState );
-            setValveState( UF2, (VALVE_STATE_NAMES_T)outletValveState );
+            setValveState( UF1, inletValveState );
+            setValveState( UF2, outletValveState );
             break;
 
         default:
@@ -253,7 +253,7 @@
         pistonPumpExecState[ pumpId ]  = PISTON_PUMP_OFF_STATE;
 
         // Close Inlet and Outlet valve
-        pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+        pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_CLOSED, VALVE_STATE_CLOSED );
 
         //Stop the pump
         requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
@@ -278,7 +278,7 @@
     PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_OFF_STATE;
 
     // Close Inlet and Outlet valve
-    //pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+    //pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_CLOSED, VALVE_STATE_CLOSED );
 
     //Stop the pump
     //requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
@@ -308,7 +308,7 @@
     currentPistonPumpSwitchingCounter [ pumpId ]    = 0;
 
     // Open Inlet and Outlet valve
-    pistonPumpInletOutletValveControl( pumpId, FALSE, TRUE );
+    pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_OPEN, VALVE_STATE_CLOSED );
 
     // start stepper motor with the expected quantity
     setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)pumpId, pistonPumpSetSpeed[ pumpId ], pistonPumpVolumeinMl[ pumpId ] );
@@ -339,7 +339,7 @@
     if ( currentPistonPumpSwitchingCounter[ pumpId ] >= pistonPumpFillPeriod )
     {
         // Close Inlet and Outlet valve
-        pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+        pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_CLOSED, VALVE_STATE_CLOSED );
 
         //Stop the pump
         requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
@@ -368,7 +368,7 @@
     F32 pumpSpeed = pistonPumpSetSpeed[ pumpId ] * -1.0 ; // This is to rotate motor in reverse direction
 
     // Close Inlet and Open Outlet valve
-    pistonPumpInletOutletValveControl( pumpId, TRUE, FALSE );
+    pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_CLOSED, VALVE_STATE_OPEN );
 
     // start stepper motor with the expected quantity
     setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)pumpId, pumpSpeed, pistonPumpVolumeinMl[ pumpId ] );
@@ -399,7 +399,7 @@
     if ( currentPistonPumpSwitchingCounter[ pumpId ] >= pistonPumpDispensePeriod )
     {
         // Close Inlet and Outlet valve
-        pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+        pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_CLOSED, VALVE_STATE_CLOSED );
 
         //Stop the pump
         requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );