Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r17bfea4963b43699d23ae3730dcaf3bf349d915d -rd7c545dff2f13dd75ebab0af997c45047c844f7a
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 17bfea4963b43699d23ae3730dcaf3bf349d915d)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision d7c545dff2f13dd75ebab0af997c45047c844f7a)
@@ -7,8 +7,8 @@
 *
 * @file    Valves.h
 *
-* @author  (last)      “Raghu
-* @date    (last)      03-Feb-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      30-Mar-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  26-Aug-2024
@@ -32,8 +32,8 @@
 /// Enumeration of available valve state names per valve type (from SA and DD SRS documents).
 typedef enum ValveStateNames
 {
-    VALVE_STATE_OPEN = 0,                         ///< Open valve state,
-    VALVE_STATE_CLOSED,                           ///< Closed valve state,
+    VALVE_STATE_CLOSED = 0,                       ///< Closed valve state,
+    VALVE_STATE_OPEN,                             ///< Open valve state,
     NUM_OF_VALVE_STATES                           ///< number of valve states
 } VALVE_STATE_NAMES_T;
 
@@ -46,11 +46,6 @@
     NUM_OF_RECOVERY_STATES            ///< Number of recovery states
 } RECOVERY_STATE_T;
 
-#define NUM_OF_DD_VALVES      ( ( LAST_DD_VALVE - FIRST_DD_VALVE ) + 1 )
-#define NUM_OF_IOFP_VALVES    ( ( LAST_FP_VALVE - FIRST_IO_VALVE ) + 1 )
-#define NUM_OF_IO_VALVES      ( ( LAST_IO_VALVE - FIRST_IO_VALVE ) + 1 )
-#define NUM_OF_FP_VALVES      ( ( LAST_FP_VALVE - FIRST_FP_VALVE ) + 1 )
-
 #pragma pack(push, 1)
 /// Valves publish structure
 typedef struct
@@ -66,7 +61,7 @@
 {
     U08 valvesIOState;                            ///< Commanded IO valve states (bits).
     U08 valvesFPState;                            ///< Commanded FP valve states (bits).
-    U08 valvesSensedState[ NUM_OF_IOFP_VALVES ];  ///< Sensed FP valve states (enumerations).
+    U08 valvesSensedState[ LAST_FP_VALVE - FIRST_IO_VALVE + 1 ];  ///< Sensed FP valve states (enumerations).
 } FP_VALVES_DATA_T;
 
 /// Balancing chamber valve states override structure