Index: MessagePayloads.h
===================================================================
diff -u -r4f6fdfe324a5e07bde422fd1bb2a38526c502536 -r9e1f1a6979c06dafaaf5f95912de5bc25a10f86c
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision 4f6fdfe324a5e07bde422fd1bb2a38526c502536)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision 9e1f1a6979c06dafaaf5f95912de5bc25a10f86c)
@@ -7,8 +7,8 @@
 *
 * @file    MessagePayloads.h
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      12-Jan-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      15-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2024
@@ -46,6 +46,7 @@
     F32  bicarbConvFactor;                              ///< Conversion factor of bicarbonate.
     U32  sodium;                                        ///< Set sodium being used to make dialysate.
     U32  bicarbonate;                                   ///< Set bicarbonate being used to make dialysate.
+    F32  substitutionRate;                              ///< Set HDF rate ( mL/min).
 } DIALYSATE_DELIVERY_REQ_PAYLOAD_T;
 
 /// Payload record structure for requesting pre generate dialysate.
@@ -54,19 +55,12 @@
     BOOL start;                                         ///< Flag indicating whether to start pre-gen dialysate(TRUE) or stop (FALSE).
     F32  dialRate;                                      ///< Set dialysate rate (mL/min).
     F32  dialTemp;                                      ///< Set dialysate temperature (deg C).
-    U32  acidType;                                      ///< Type of acid being used to make dialysate.
-    U32  bicarbType;                                    ///< Type of bicarb being used to make dialysate.
+    F32  acidConvFactor;                                ///< Conversion factor of acid type selected.
+    F32  bicarbConvFactor;                              ///< Conversion factor of bicarbonate.
+    U32  sodium;                                        ///< Set sodium being used to make dialysate.
+    U32  bicarbonate;                                   ///< Set bicarbonate being used to make dialysate.
 } PRE_GEN_DIALYSATE_REQ_PAYLOAD_T;
 
-/// Enumeration of operation modes.  These are in order of priority (highest to lowest).
-enum RO_Cmd_Ids
-{
-    RO_PRE_GEN = 0,                                     ///< Pre Generate permeate water mode
-    RO_GEN_WATER,                                       ///< Generate permeate water mode
-    NUM_OF_RO_CMD                                       ///< Number of RO command IDs
-};
-typedef enum RO_Cmd_Ids RO_CMD_ID;  ///< Type for RO command IDS
-
 /// Payload record structure for requesting RO water.
 typedef struct
 {
@@ -96,8 +90,26 @@
     F32 p17Pressure;                       ///< Pressure after RO filter (P17)
 } FP_PRESSURE_DATA_T;
 
+/// Generate dialysate mode data structure
+typedef struct
+{
+    U32 genDialysateExecState;             ///< Generate dialysate execution state
+    BOOL isDialDelInProgress;              ///< Whether Dialysate Delivery in progress or not
+    BOOL isDialysateGoodtoDeliver;         ///< Ready to deliver dialysate or not
+    F32 currentQd;                         ///< Current dialysate flow rate (ml/min)
+} GEN_DIALYSATE_MODE_DATA_T;
+
 #pragma pack(pop)
 
+/// Enumeration of operation modes.  These are in order of priority (highest to lowest).
+enum RO_Cmd_Ids
+{
+    RO_PRE_GEN = 0,                                     ///< Pre Generate permeate water mode
+    RO_GEN_WATER,                                       ///< Generate permeate water mode
+    NUM_OF_RO_CMD                                       ///< Number of RO command IDs
+};
+typedef enum RO_Cmd_Ids RO_CMD_ID;  ///< Type for RO command IDS
+
 /**@}*/
 
 #endif