Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rb9d2f7eb5f099009b6c8979f6d8b59001c065711 -r84eab2f306d2a7c33619042ec69a032f5edbb6db
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision b9d2f7eb5f099009b6c8979f6d8b59001c065711)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 84eab2f306d2a7c33619042ec69a032f5edbb6db)
@@ -416,6 +416,56 @@
     return nextState;
 }
 
+
+//static VALVE_STATE_T handleValvesNotHomedState( VALVE_T valve )
+//{
+//    VALVE_STATE_T nextState = VALVE_STATE_HOMING_NOT_HOMED;
+//
+//    if ( TRUE == currentValveStates[ valve ].hasHomingBeenRequested )
+//    {
+//        if ( TRUE == homePinchValve( valve ) )
+//        {
+//            currentValveStates[ valve ].hasHomingBeenRequested = FALSE;
+//            currentValveStates[ valve ].hasValveBeenHomed      = FALSE;
+//            currentValveStates[ valve ].homingOperationActive  = TRUE;
+//            currentValveStates[ valve ].currentPosition        = VALVE_POSITION_NOT_IN_POSITION;
+//           currentValveStates[ valve ].valveOpsStartTime = getMSTimerCount();
+//        }
+//    }
+//    else if ( ( TRUE == currentValveStates[ valve ].homingOperationActive ) &&
+//             ( TRUE == isPinchValveHomed( valve ) ) && ( FALSE == isPinchValveBusy( valve ) ) )
+//    {
+//        currentValveStates[ valve ].homingOperationActive = FALSE;
+//        currentValveStates[ valve ].hasValveBeenHomed     = TRUE;
+//        if ( TRUE == movePinchValveToStoredPosition( valve, VALVE_POSITION_C_CLOSE ) )
+//        {
+//            currentValveStates[ valve ].commandedPosition = VALVE_POSITION_C_CLOSE;
+//            currentValveStates[ valve ].currentPosition = VALVE_POSITION_NOT_IN_POSITION;
+//            currentValveStates[ valve ].valveOpsStartTime = getMSTimerCount();
+//            nextState = VALVE_STATE_IN_TRANSITION;
+//        }
+//        else
+//        {
+//            currentValveStates[ valve ].hasValveBeenHomed = FALSE;
+//            currentValveStates[ valve ].currentPosition = VALVE_POSITION_NOT_IN_POSITION;
+//            nextState = VALVE_STATE_HOMING_NOT_HOMED;
+//        }
+//    }
+//    else if ( ( TRUE == currentValveStates[ valve ].homingOperationActive ) &&
+//             ( TRUE == didTimeout( currentValveStates[ valve ].valveOpsStartTime, VALVE_HOMING_TIMEOUT_MS ) ) &&
+//             ( TRUE != getCPLDACPowerLossDetected() ) )
+//    {
+//
+//        currentValveStates[ valve ].homingOperationActive = FALSE;
+//        currentValveStates[ valve ].hasValveBeenHomed     = FALSE;
+//        currentValveStates[ valve ].currentPosition       = VALVE_POSITION_NOT_IN_POSITION;
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT, (U32)valve, (U32)getPinchValvePosition( valve ) )
+//        nextState = VALVE_STATE_HOMING_NOT_HOMED;
+//    }
+//
+//    return nextState;
+//}
+
 /*********************************************************************//**
  * @brief
  * The handleValvesIdleState function handles the Idle state of the state