Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rdd5bc6e4b5b5477043261388db367312425d1be7 -r6d2e13dfca9285909eddd958ca82bf3da1157412
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision dd5bc6e4b5b5477043261388db367312425d1be7)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6d2e13dfca9285909eddd958ca82bf3da1157412)
@@ -55,7 +55,6 @@
 {
     VALVE_POSITION_T commandedPosition;                                                         ///< Valve commanded position enum.
     VALVE_POSITION_T currentPosition;                                                           ///< Valve current position enum.
-//    S16              priorEncPosition;                                                          ///< Valve prior position in encoder counts.
     BOOL             hasTransitionBeenRequested;                                                ///< Valve transition request flag.
     VALVE_STATE_T    controlState;                                                              ///< Valve control state.
     U32              valveOpsStartTime;                                                         ///< Valve transition start time.
@@ -132,7 +131,6 @@
         pendingValvePositionChange[ valve ]                    = VALVE_POSITION_NOT_IN_POSITION;
     }
 
-
 #ifdef ASN_DEMO
     currentValveStates[ H1_VALV ].positionsABC[ VALVE_POSITION_C_CLOSE ] = ROTARY_VALVE_MICROSTEP_FRACTION;
     currentValveStates[ H1_VALV ].positionsABC[ VALVE_POSITION_B_OPEN ] = 1728;
@@ -200,7 +198,8 @@
 {
     BOOL result = FALSE;
 
-    if ( ( valve < NUM_OF_VALVES ) && ( position > VALVE_POSITION_NOT_IN_POSITION ) && ( position < NUM_OF_VALVE_POSITIONS ) )
+    if ( ( valve < NUM_OF_VALVES ) && ( position > VALVE_POSITION_NOT_IN_POSITION ) &&
+                                      ( position < NUM_OF_VALVE_POSITIONS ) )
     {
         if ( ( TRUE == currentValveStates[ valve ].hasValveBeenHomed ) &&
              ( FALSE == currentValveStates[ valve ].homingOperationActive ) &&
@@ -213,7 +212,8 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_VALVES_INVALID_PARAM, ( (U32)valve << SHIFT_16_BITS_FOR_WORD_SHIFT ) | (U32)position )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_VALVES_INVALID_PARAM,
+                                   ( (U32)valve << SHIFT_16_BITS_FOR_WORD_SHIFT ) | (U32)position )
     }
 
     SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_VALVE_POS_CHANGE, (U32)result, (U32)position );
@@ -456,6 +456,7 @@
             nextState                                              = VALVE_STATE_IN_TRANSITION;
         }
     }
+    // TODO: Later
 //    else
 //    {
 //        if ( isValveAtCommandedPosition( valve ) != TRUE )
@@ -498,6 +499,7 @@
               ( TRUE != getCPLDACPowerLossDetected() ) )
     {
         currentValveStates[ valve ].currentPosition   = VALVE_POSITION_NOT_IN_POSITION;
+        // TODO: Later
         //currentValveStates[ valve ].hasValveBeenHomed = FALSE;
 
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT, (U32)valve, (U32)getPinchValvePosition( valve ) )