Index: firmware/App/Drivers/PinchValve.c
===================================================================
diff -u -r9565d9627edc032a2c6414a38f38f14c62e3ec87 -r7c5d664608c68233915578a07ec713f434d5407f
--- firmware/App/Drivers/PinchValve.c	(.../PinchValve.c)	(revision 9565d9627edc032a2c6414a38f38f14c62e3ec87)
+++ firmware/App/Drivers/PinchValve.c	(.../PinchValve.c)	(revision 7c5d664608c68233915578a07ec713f434d5407f)
@@ -117,7 +117,7 @@
 // ********** private data **********
 
 static PINCH_VALVE_STATE_T pinchValveState;
-static PINCH_VALVE_EXECUTE_STEP_T executeStep;
+static PINCH_VALVE_EXECUTE_STEP_T executeStep;firmware
 static PINCH_VALVE_COMMAND_T activeCommand;
 static PINCH_VALVE_RESPONSE_T lastResponse;
 static PINCH_VALVE_CMD_RESULT_T commandResult;
@@ -153,7 +153,7 @@
     commandResult = PINCH_VALVE_CMD_RESULT_IDLE;
     commandPending = FALSE;
 
-    activeCommand.valve = PINCH_VALVE_H1;
+    activeCommand.valve = H1_VALV;
     activeCommand.cmdType = PINCH_VALVE_CMD_TYPE_NONE;
     activeCommand.cmdHeader = 0;
     activeCommand.inputWord1 = 0U;
@@ -171,8 +171,8 @@
     lastResponse.readCount = 0U;
     lastResponse.errorCount = 0U;
 
-    setValveEnableReset( PINCH_VALVE_H1, 0U );
-    setValveEnableReset( PINCH_VALVE_H19, 0U );
+    setValveEnableReset( H1_VALV, 0U );
+    setValveEnableReset( H19_VALV, 0U );
 }
 
 /*********************************************************************//**
@@ -456,7 +456,7 @@
                                     command->rxWordCount,
                                     command->writeOnly );
 
-    if ( command->valve == PINCH_VALVE_H1 )
+    if ( command->valve == H1_VALV )
     {
         setH1CmdHeader( command->cmdHeader );
         setH1InputWord1( command->inputWord1 );
@@ -482,7 +482,7 @@
  *************************************************************************/
 static void readFpgaResponse( VALVE_T valve, PINCH_VALVE_RESPONSE_T *response )
 {
-    if ( valve == PINCH_VALVE_H1 )
+    if ( valve == H1_VALV )
     {
         response->spiCmdStatus = getH1SPICmdStatus();
         response->readCount = getH1ReadCount();
@@ -536,7 +536,7 @@
 {
     U08 status;
 
-    if ( valve == PINCH_VALVE_H1 )
+    if ( valve == H1_VALV )
     {
         status = getH1SPICmdStatus();
     }
@@ -580,7 +580,7 @@
  *************************************************************************/
 static void setValveEnableReset( VALVE_T valve, U08 enableReset )
 {
-    if ( valve == PINCH_VALVE_H1 )
+    if ( valve == H1_VALV )
     {
         setH1EnableReset( enableReset );
     }