Index: firmware/App/Drivers/PinchValve.c
===================================================================
diff -u -r73e17d7f9edcedb40fef1d905267ae629b8ace42 -rb6f6e1c58981bc13c884a0e7cf95fc6d26495f03
--- firmware/App/Drivers/PinchValve.c	(.../PinchValve.c)	(revision 73e17d7f9edcedb40fef1d905267ae629b8ace42)
+++ firmware/App/Drivers/PinchValve.c	(.../PinchValve.c)	(revision b6f6e1c58981bc13c884a0e7cf95fc6d26495f03)
@@ -563,11 +563,10 @@
                     commandFailed[ valve ]               = FALSE;
                     functionState[ valve ]               = PINCH_VALVE_FUNCTION_SEND_STATE;
                 }
-
                 break;
 
             case PINCH_VALVE_FUNCTION_SEND_STATE:
-                if ( ( activeCommandArray[ valve ] != 0 ) && ( activeCommandIndex[ valve ] < activeCommandCount[ valve ] ) )
+                if ( activeCommandArray[ valve ] != 0 )
                 {
                     if ( TRUE == setPinchValveCommand( valve, &activeCommandArray[ valve ][ activeCommandIndex[ valve ] ] ) )
                     {
@@ -576,32 +575,34 @@
                 }
                 else
                 {
-                    commandFailed[ valve ] = TRUE;
+                    //commandFailed[ valve ] = TRUE;
                     functionState[ valve ] = PINCH_VALVE_FUNCTION_IDLE_STATE;
+                    // TODO - s/w fault
                 }
 
                 break;
 
             case PINCH_VALVE_FUNCTION_WAIT_STATE:
-                if ( ( PINCH_VALVE_CMD_IDLE_STATE == commandState[ valve ] ) && ( TRUE == commandCompleted[ valve ] ) )
+                if ( PINCH_VALVE_CMD_IDLE_STATE == commandState[ valve ] ) // && ( TRUE == commandCompleted[ valve ] ) )
                 {
-                    BOOL repeatCommand = FALSE;
+//                    BOOL repeatCommand = FALSE;
 
-                    commandCompleted[ valve ] = FALSE;
+//                    commandCompleted[ valve ] = FALSE;
 
                     if ( TRUE == commandFailed[ valve ] )
                     {
+                        // TODO - valve fault
                         functionState[ valve ] = PINCH_VALVE_FUNCTION_IDLE_STATE;
                     }
-                    else if ( FALSE == isPinchValveCommandCompleted( valve, &repeatCommand ) )
-                    {
-                        commandFailed[ valve ] = TRUE;
-                        functionState[ valve ] = PINCH_VALVE_FUNCTION_IDLE_STATE;
-                    }
-                    else if ( TRUE == repeatCommand )
-                    {
-                        functionState[ valve ] = PINCH_VALVE_FUNCTION_SEND_STATE;
-                    }
+//                    else if ( FALSE == isPinchValveCommandCompleted( valve, &repeatCommand ) )
+//                    {
+//                        commandFailed[ valve ] = TRUE;
+//                        functionState[ valve ] = PINCH_VALVE_FUNCTION_IDLE_STATE;
+//                    }
+//                    else if ( TRUE == repeatCommand )
+//                    {
+//                        functionState[ valve ] = PINCH_VALVE_FUNCTION_SEND_STATE;
+//                    }
                     else
                     {
                         activeCommandIndex[ valve ]++;
@@ -616,6 +617,7 @@
                         }
                     }
                 }
+                // TODO - need to handle else if IDLE and not completed (error?)
                 break;
 
             default: