Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r046ffdda014e511363b04ed523eb3399a3eb4ad0 -rc0b93a6de34d38d42e7a678b6ced59220e1d14da
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 046ffdda014e511363b04ed523eb3399a3eb4ad0)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision c0b93a6de34d38d42e7a678b6ced59220e1d14da)
@@ -21,7 +21,7 @@
 // ********** public definitions **********
 
 #include "TDCommon.h"
-#include "RotaryValve.h"
+#include "PinchValve.h"
 
 /**
  *  @defgroup Valves Valves
@@ -33,17 +33,6 @@
 
 // ********** public definitions **********
 
-/// Valves positions
-typedef enum valveStatesNames
-{
-    VALVE_POSITION_NOT_IN_POSITION = 0, ///< Valve position is unknown (cannot be used as a command)
-    VALVE_POSITION_A_INSERT_EJECT,      ///< Position A, Insert/Eject
-    VALVE_POSITION_B_OPEN,              ///< Position B, Open
-    VALVE_POSITION_C_CLOSE,             ///< Position C, Close
-    VALVE_POSITION_D_PARTIAL_CLOSE,     ///< Position D, partial close
-    NUM_OF_VALVE_POSITIONS,             ///< Number of valve positions
-} VALVE_POSITION_T;
-
 #pragma pack(push, 1)
 /// TD valves broadcast data
 typedef struct
@@ -56,7 +45,6 @@
     S16 posA;                          ///< Position A (count)
     S16 posB;                          ///< Position B (count)
     S16 posC;                          ///< Position C (count)
-    S16 posD;                          ///< Position D (count)
     S16 maxHomingPos;                  ///< Maximum homing position
 } TD_VALVE_DATA_T;
 #pragma pack(pop)
@@ -65,12 +53,12 @@
 typedef enum Valve_Control_States
 {
     VALVE_STATE_WAIT_FOR_POST = 0,                                                              ///< Valve state wait for POST.
-    VALVE_STATE_RESET_VALVE,                                                                    ///< Valve state reset valve.
-    VALVE_STATE_RESET_ENCODER,                                                                  ///< Valve state reset encoder.
-    VALVE_STATE_ENABLE_VALVE,                                                                   ///< Valve state enable valve.
-    VALVE_STATE_HOMING_NOT_STARTED,                                                             ///< Valve state homing not started.
-    VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE,                                                     ///< Valve state homing find energized edge.
-    VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE,                                                   ///< Valve state homing find de-energized edge.
+//    VALVE_STATE_RESET_VALVE,                                                                    ///< Valve state reset valve.
+//    VALVE_STATE_RESET_ENCODER,                                                                  ///< Valve state reset encoder.
+//    VALVE_STATE_ENABLE_VALVE,                                                                   ///< Valve state enable valve.
+    VALVE_STATE_HOMING_NOT_HOMED,                                                             ///< Valve state homing not started.
+//    VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE,                                                     ///< Valve state homing find energized edge.
+//    VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE,                                                   ///< Valve state homing find de-energized edge.
     VALVE_STATE_IDLE,                                                                           ///< Valve state idle.
     VALVE_STATE_IN_TRANSITION,                                                                  ///< Valve state in transition.
     NUM_OF_VALVE_STATES,                                                                        ///< Number of valve exec states.
@@ -80,7 +68,7 @@
 
 void initValves(void);
 void execValvesController(void);
-SELF_TEST_STATUS_T execValvesSelfTest( void );
+//SELF_TEST_STATUS_T execValvesSelfTest( void );
 
 BOOL homeValve( VALVE_T valve, BOOL force, BOOL cartridge );
 BOOL setValvePosition( VALVE_T valve, VALVE_POSITION_T position );