Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543 -re7e2fef9fda6c6e876f7aba1c8f837d8aa713392
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e7e2fef9fda6c6e876f7aba1c8f837d8aa713392)
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "Buttons.h"
+#include "DDInterface.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
 #include "Timers.h"
@@ -143,16 +144,38 @@
  *************************************************************************/
 static TD_PRE_TREATMENT_MODE_STATE_T handleRxState( void )
 {
-    BOOL paramsValid     = getValidTreatParamsReceived();
-    BOOL paramsConfirmed = getTreatParamsConfirmed();
-    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+    BOOL paramsValid                       = getValidTreatParamsReceived();
+    BOOL paramsConfirmed                   = getTreatParamsConfirmed();
+    TD_PRE_TREATMENT_MODE_STATE_T state    = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+    DD_OP_MODE_T ddOpMode                  = getDDOpMode();
+    DD_PRE_GEN_DIALYSATE_STATE_T ddSubMode = (DD_PRE_GEN_DIALYSATE_STATE_T)getDDSubMode();
+    BOOL isDialysateGoodTodeliver          = TRUE; // TODO update with get API for getDialGoodToDeliverStatus
+    F32 bicarbConvFactor                   = BICARBONATE_CONVERSION_FACTOR;
+    F32 presUFVolumeL                      = 0.0F;
+    F32 presUFRateLHr                      = 0.0F;
 
     // Valid + confirmed – move to next state: Patient Connection
     if ( ( TRUE == paramsValid ) && ( TRUE == paramsConfirmed ) )
     {
+        // TODO this command of requesting dialysate delivery will move to appropriate state in pre-treatment once implemented
+        if ( ( ddOpMode == DD_MODE_PREG ) && ( ddSubMode == DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND ) )
+        {
+            presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
+            presUFRateLHr = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
+            // Direct DD to generate dialysate and bypass while priming blood
+            cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateLHr,
+                                       getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), TRUE,
+                                       getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
+                                       bicarbConvFactor,
+                                       getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
+                                       getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
+        }
         // TODO: when additional Pre-Treatment states are implemented, change to TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.
         // state = TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
-        requestNewOperationMode( MODE_TREA );
+        if ( ( ddOpMode == DD_MODE_GEND ) && ( TRUE == isDialysateGoodTodeliver ) )
+        {
+            requestNewOperationMode( MODE_TREA );
+        }
     }
 
     return state;