Index: firmware/App/Modes/ModeGenDialysate.h
===================================================================
diff -u -r57dd20557f066bf5d790ce25dd11c97bb93e3cde -rc07917caced76b53a0ed8f35167fac6f9d8310a4
--- firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 57dd20557f066bf5d790ce25dd11c97bb93e3cde)
+++ firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision c07917caced76b53a0ed8f35167fac6f9d8310a4)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeGenDialysate.h
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      30-Oct-2024
+* @author  (last)      Jonny Paguio
+* @date    (last)      29-Sep-2025
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  30-Oct-2024
+* @date    (original)  06-Nov-2024
 *
 ***************************************************************************/
 
@@ -31,6 +31,10 @@
 
 // ********** public definitions **********
 
+#define FRESH_DIAL_PUMP_INITIAL_RPM             2500                                        ///< Nominal RPM target for fresh dialysate pump to maintain required pressure.
+#define SPENT_DIAL_PUMP_INITIAL_RPM             2300                                        ///< Nominal RPM target for spent dialysate pump to maintain required pressure.
+#define SPENT_DIAL_PUMP_FILL_RPM                350                                         ///< Nominal RPM target for spent chamber fill operations.
+
 /// Generate dialysate mode data structure
 typedef struct
 {
@@ -43,6 +47,7 @@
     F32 d18Pressure;                                    ///< Hydraulics chamber positive pressure
     F32 d51Pressure;                                    ///< Spent Dialysate positive pressure
     BOOL isDialysateGoodtoDeliver;                      ///< Ready to deliver dialysate or not
+    F32 currentQd;                                      ///< Current dialysate flow rate (ml/min)
 } GEN_DIALYSATE_MODE_DATA_T;
 
 // ********** public function prototypes **********
@@ -52,15 +57,18 @@
 U32  execGenDialysateMode( void );                          // Execute the gen dialysate mode state machine (call from OperationModes)
 void execGenDialysateMonitor( void );                       // Dialysate generation monitor
 
+BOOL hydChamberWaterInletControl( void );                   // Hydraulics chamber inlet water control
 DD_GEND_MODE_STATE_T getCurrentGenDialysateState( void );   // Get the current state of the gen dialysate mode.
 U32 getDialGoodToDeliverStatus( void );                     // Get the dialysate good to deliver status
-void setTreatementParamUpdate( void );                      // To indicate one or more treatment parameters updated
-void updateTreatementSettings( void );                      // Process the recent treatment parameters changes
+void setTreatmentParamUpdate( void );                       // To indicate one or more treatment parameters updated
+void updateTreatmentSettings( void );                       // Process the recent treatment parameters changes
+BOOL requestDDGenDialyasteStop( void );                     // Stop generate dialysate
 
 BOOL testDDGenDialysateDataPublishIntervalOverride( MESSAGE_T *message );   // GenD Mode data publish interval override
 BOOL testDialDeliveryInProgressOverride( MESSAGE_T *message );              // To override the dialysate delivery in progress flag
 BOOL testDialGoodToDeliverStatusOverride( MESSAGE_T *message );             // To override the dialysate good to deliver status flag
 BOOL testGenDHydChamberFluidTempOverride( MESSAGE_T *message );             // Override the hydraulics chamber fluid temperature
+BOOL testGenDExecStateOverride( MESSAGE_T *message );                       // Override the Gen dialysate execution state
 
 /**@}*/