Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rdc883aab56e769b2dec294e084f1378a178ba089 -r6ffea0047812fd93e644b789071d410a15d53fee
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision dc883aab56e769b2dec294e084f1378a178ba089)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6ffea0047812fd93e644b789071d410a15d53fee)
@@ -7,8 +7,8 @@
 *
 * @file    Valves.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      10-Feb-2026
+* @author  (last)      Raghu Kallala
+* @date    (last)      23-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  26-Aug-2024
@@ -452,7 +452,7 @@
                  ( D65_VALV == valveID ) || ( D64_VALV == valveID ) || ( D31_VALV == valveID ) || ( D34_VALV == valveID ) || ( D35_VALV == valveID )  ||
                  ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID )  || ( M4_VALV == valveID )  || ( D23_VALV == valveID )  ||
                  ( D19_VALV == valveID ) || ( D25_VALV == valveID ) || ( D21_VALV == valveID ) || ( D24_VALV == valveID ) || ( D20_VALV == valveID )  ||
-                 ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D80_VALV == valveID ) || ( D81_VALV == valveID ) || ( D79_PMP_VALV == valveID )   ||
+                 ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D80_VALV == valveID ) || ( D81_VALV == valveID ) || ( D88_79_VALV == valveID )   ||
                  ( P11_VALV == valveID ) || ( P33_VALV == valveID ) || ( P34_VALV == valveID ) || ( P37_VALV == valveID ) || ( P6_VALV == valveID ) ||
                  ( M12_VALV == valveID ) || ( P39_VALV == valveID ) || ( D83_VALV == valveID ) || ( D91_VALV == valveID ) || ( D100_VALV == valveID ) || ( D85_VALV == valveID )  )
             {
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rdc883aab56e769b2dec294e084f1378a178ba089 -r6ffea0047812fd93e644b789071d410a15d53fee
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision dc883aab56e769b2dec294e084f1378a178ba089)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 6ffea0047812fd93e644b789071d410a15d53fee)
@@ -7,8 +7,8 @@
 *
 * @file    Valves.h
 *
-* @author  (last)      Arpita Srivastava
-* @date    (last)      09-Feb-2026
+* @author  (last)      Dara Navaei
+* @date    (last)      19-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  26-Aug-2024
@@ -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