Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rf9c86e807b65164850947909bf63bd327ed69a32 -rf1adb311cbf9bcf5863864d165f68e4a497ae627
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision f9c86e807b65164850947909bf63bd327ed69a32)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision f1adb311cbf9bcf5863864d165f68e4a497ae627)
@@ -7,8 +7,8 @@
 *
 * @file    Valves.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      04-May-2026
+* @author  (last)      Varshini Nagabooshanam
+* @date    (last)      28-Jul-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  24-Oct-2024
@@ -21,7 +21,7 @@
 // ********** public definitions **********
 
 #include "TDCommon.h"
-#include "RotaryValve.h"
+#include "PinchValve.h"
 
 /**
  *  @defgroup Valves Valves
@@ -36,17 +36,6 @@
 #define VALVE_NO_FORCE_HOME             FALSE       ///< Do not re-home valve if already homed - just go to position A instead
 #define VALVE_CARTRIDGE_MAY_BE_PRESENT  TRUE        ///< A cartridge may be present, so allow for homed positions to be further away from where expected
 
-/// 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
@@ -59,21 +48,14 @@
     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)
 
 /// Valve controller states
 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_HOMING_NOT_HOMED,                                                               ///< Valve state homing not started.
     VALVE_STATE_IDLE,                                                                           ///< Valve state idle.
     VALVE_STATE_IN_TRANSITION,                                                                  ///< Valve state in transition.
     NUM_OF_VALVE_STATES,                                                                        ///< Number of valve exec states.
@@ -83,7 +65,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 );