Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r32d273feed8fd8c1278a2a9231b912aef37629ab -r8759adf902288368a8b0aaea7a809cc88822a9ab
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 32d273feed8fd8c1278a2a9231b912aef37629ab)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8759adf902288368a8b0aaea7a809cc88822a9ab)
@@ -84,7 +84,7 @@
  *************************************************************************/
 U32 transitionToStandbyMode( void )
 {
-//    TD_OP_MODE_T previousOpMode = getPreviousOperationMode();     //ToDo
+//    TD_OP_MODE_T previousOpMode = getPreviousOperationMode();     //TODO
 
     // Re-initialize when transitioning to standby mode
     initStandbyMode();
@@ -104,11 +104,11 @@
     // Set valves to default positions
     set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
     set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-    if ( getValveState( H1_VALV ) < VALVE_STATE_IDLE )
+    if ( getValveState( H1_VALV ) == VALVE_STATE_IDLE )
     {
         setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
     }
-    if ( getValveState( H19_VALV ) < VALVE_STATE_IDLE )
+    if ( getValveState( H19_VALV ) == VALVE_STATE_IDLE )
     {
         setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
     }
@@ -121,7 +121,7 @@
 
     // Request DD service record and usage information from DD
 //    sendDDServiceRequestToDD();
-    //ToDo: Service record id not available
+    //TODO: Service record id not available
 //    broadcastData( MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD, COMM_BUFFER_OUT_CAN_TD_2_DD, requestPayload, sizeof( requestPayload ) );
 //    broadcastData( MSG_ID_TD_DD_USAGE_INFO_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_DD, requestPayload, sizeof( requestPayload ) );
 //    sendDDUsageInfoRequestToDD();        //TODO need to enable
@@ -223,7 +223,7 @@
 {
     TD_STANDBY_STATE_T state     = STANDBY_WAIT_FOR_TREATMENT_STATE;
     F32 bicarbConvFactor         = BICARBONATE_CONVERSION_FACTOR;
-    //ToDo
+    //TODO
 //    DD_OP_MODE_T ddOperationMode = getDDOpMode();
 
 //    switch ( ddOperationMode )
@@ -251,7 +251,7 @@
     // If DD is communicating and we don't yet have DD version info, request it
     if ( TRUE == isDDCommunicating() )
     {
-        if ( FALSE == isDDCompatibile())
+        if ( FALSE == isDDCompatible())
         {
             U08 fwVersionRequestPayload[3] = { 0U, 0U, 0U };
 
@@ -276,13 +276,15 @@
         respRecord.venPresLimitAsymmetricmmHg = getSysConfigTreatmentParameterU32DefaultValue( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
         respRecord.tmpPresLimitWindowmmHg     = getSysConfigTreatmentParameterU32DefaultValue( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW );
         sendPressureLimitsChangeResponse( &respRecord );
-        // start DD pre-gen  // TODO
+        // start DD pre-gen  // TODO we need to add UF rate as per new requirement
+
         cmdStartPreGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
                                       getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ),
                                       getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
                                       bicarbConvFactor,
                                       getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
-                                      getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
+                                      getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ),
+                                      getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) );
         // Start treatment workflow with pretreatment mode
         // Set fluid type
         setFluidType( modality );
@@ -427,11 +429,11 @@
             {
                 rejReason = REQUEST_REJECT_REASON_DD_BUSY;
             }
-            else if ( FALSE == isDDCompatibile() )
+            else if ( FALSE == isDDCompatible() )
             {
                 rejReason = REQUEST_REJECT_REASON_DD_INCOMPATIBLE;
             }
-            // ToDo: Need to uncomment below after implementation
+            // TODO: Need to uncomment below after implementation
 //            else if ( TRUE == isDDDisinfectionOverdue() )
 //            {
 //                rejReason = REQUEST_REJECT_REASON_DISINFECT_HAS_BEEN_EXPIRED;
@@ -465,7 +467,7 @@
             else
             {
 //                Low battery is a warning only, not a rejection.
-                //ToDo
+                //TODO
 //                if ( TRUE == isBatteryRemainingCapacityLessThan60Wh() )
 //                {
 //                    SET_ALARM( ALARM_ID_TD_LOW_BATTERY_CHARGE );