Index: firmware/App/Modes/ModeGenDialysate.h
===================================================================
diff -u -rbce6e6d1cfb6e8a0b186419416460ead3a44e5e1 -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f
--- firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision bce6e6d1cfb6e8a0b186419416460ead3a44e5e1)
+++ firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
@@ -31,18 +31,20 @@
 
 // ********** 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.
+
 /// Generate dialysate mode data structure
 typedef struct
 {
     U32 genDialysateExecState;                          ///< Generate dialysate execution state
     BOOL isDialDelInProgress;                           ///< Whether Dialysate Delivery in progress or not
-    U32 floaterLevel1;                                  ///< Floater level 1 (low or medium)
-    U32 floaterLevel2;                                  ///< Floater level 2 (medium or high)
-    U32 BiCarbLevel;                                    ///< BiCarb Chamber level
-    U32 SpentChamberLevel;                              ///< Spent dialysate chamber level
-    F32 hydNegativePressure;                            ///< Hydraulics chamber negative pressure
-    F32 hydPositivePressure;                            ///< Hydraulics chamber positive pressure
-    F32 spentDialysatePressure;                         ///< Spent Dialysate positive pressure
+    U32 d6Level;                                        ///< Floater level (low, medium and high)
+    U32 d63Level;                                       ///< BiCarb Chamber level
+    U32 d46Level;                                       ///< Spent dialysate chamber level
+    F32 d9Pressure;                                     ///< Hydraulics chamber negative pressure
+    F32 d18Pressure;                                    ///< Hydraulics chamber positive pressure
+    F32 d51Pressure;                                    ///< Spent Dialysate positive pressure
     BOOL isDialysateGoodtoDeliver;                      ///< Ready to deliver dialysate or not
 } GEN_DIALYSATE_MODE_DATA_T;
 
@@ -53,13 +55,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 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
 
 /**@}*/