Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r4c738395b1627aa36f30c14c2e374acf0e88f5f8 -rc0544e0ad0a0e83f247760f26205d79b64279ebe
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4c738395b1627aa36f30c14c2e374acf0e88f5f8)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c0544e0ad0a0e83f247760f26205d79b64279ebe)
@@ -107,11 +107,11 @@
     // Set valves to default positions
     set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
     set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-    if ( getValveState( H1_VALV ) < VALVE_STATE_IDLE )
+    if ( VALVE_STATE_IDLE == getValveState( H1_VALV ) )
     {
         setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
     }
-    if ( getValveState( H19_VALV ) < VALVE_STATE_IDLE )
+    if ( VALVE_STATE_IDLE == getValveState( H19_VALV ) )
     {
         setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
     }
@@ -165,8 +165,8 @@
             if ( ++d > 40 )
             {
                 d = 0;
-                setPinchValvePosition( H1_VALV, p );
-                setPinchValvePosition( H19_VALV, p );
+                setPinchValvePosition( H1_VALV, (VALVE_POSITION_T)p );
+                setPinchValvePosition( H19_VALV, (VALVE_POSITION_T)p );
                 p++;
                 if ( p >= NUM_OF_VALVE_POSITIONS )
                 {
@@ -216,26 +216,23 @@
 {
     TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
 
-    // Wait for door to be closed so we can home actuators
-//    if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
-//    {
-        // If we haven't already initiated homing of actuators, initiate now
-        if ( homingInitiated != TRUE )
-        {
-            VALVE_T valve;
+    // If we haven't already initiated homing of actuators, initiate now
+    if ( homingInitiated != TRUE )
+    {
+        VALVE_T valve;
 
-            // Home pumps and valves
-            for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve )
-            {
-                homeValve( valve, FALSE, TRUE );
-            }
+        // Home pumps and valves
+        for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve )
+        {
+            homeValve( valve, FALSE, TRUE );
+        }
 //            homeBloodPump();
 //            homeDialInPump();
 //            homeDialOutPump();
 //            retractSyringePump();
 
-            homingInitiated = TRUE;
-        }
+        homingInitiated = TRUE;
+    }
 //        else
 //        {
 //            // If homing has been initiated, wait for syringe pump to home and the verify force sensor calibration