Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -rbb114842e73659f097bb8b8ec0d670bfa4f8cb73 -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision bb114842e73659f097bb8b8ec0d670bfa4f8cb73)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -24,6 +24,7 @@
 #include "DialOutFlow.h"
 #include "ModeTreatmentParams.h"
 #include "OperationModes.h"
+#include "SyringePump.h"
 #include "SystemCommMessages.h"
 
 /**
@@ -61,10 +62,10 @@
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=3},    {.uInt=0}    }, // TREATMENT_PARAM_DIALYZER_TYPE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=60},   {.uInt=30}   }, // TREATMENT_PARAM_BP_MEAS_INTERVAL
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=150},  {.uInt=75}   }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATE
-    { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=200},  {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
-    { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=200},  {.sInt=100}  }, // TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT
-    { CRITICAL_DATA_TYPE_S32, {.sInt=-100}, {.sInt=600},  {.sInt=-100} }, // TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT
-    { CRITICAL_DATA_TYPE_S32, {.sInt=100},  {.sInt=600},  {.sInt=400}  }, // TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=0},    {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=0},    {.sInt=0}    }, // TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=20},   {.sInt=600},  {.sInt=20}   }, // TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT
+    { CRITICAL_DATA_TYPE_S32, {.sInt=20},   {.sInt=600},  {.sInt=400}  }, // TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT
     { CRITICAL_DATA_TYPE_F32, {.sFlt=0.0},  {.sFlt=1.0},  {.sFlt=0.0}  }, // TREATMENT_PARAM_HEPARIN_DISPENSE_RATE
     { CRITICAL_DATA_TYPE_F32, {.sFlt=0.0},  {.sFlt=2.0},  {.sFlt=0.0}  }, // TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME
     { CRITICAL_DATA_TYPE_F32, {.sFlt=35.0}, {.sFlt=38.0}, {.sFlt=37.0} }, // TREATMENT_PARAM_DIALYSATE_TEMPERATURE
@@ -103,6 +104,8 @@
 void initTreatParamsMode( void )
 {
     currentTreatmentParamsState = HD_TREATMENT_PARAMS_MODE_STATE_START;
+    // Reset all treatment parameters
+    resetAllTreatmentParameters();
 }
 
 /*********************************************************************//**
@@ -118,9 +121,6 @@
     // Reset this mode
     initTreatParamsMode();
 
-    // Reset all treatment parameters when transitioning to this mode
-    resetAllTreatmentParameters();
-
     validTreatParamsReceived = FALSE;
     treatParamsConfirmed = FALSE;
     treatParamsRejected = FALSE;
@@ -258,6 +258,13 @@
  *************************************************************************/
 U32 execTreatParamsMode( void )
 {
+    BOOL stop = isStopButtonPressed();
+
+    if ( TRUE == stop )
+    {
+        // Ignore stop button in this mode.
+    }
+
     // Execute mode state machine
     switch ( currentTreatmentParamsState )
     {
@@ -332,10 +339,7 @@
         // Set all treatment parameters (except UF volume which is not yet received)
         for ( param = TREATMENT_PARAM_FIRST_UINT; param < TREATMENT_PARAM_UF_VOLUME; param++ )
         {
-            if ( FALSE == setCriticalData( &treatmentParameters[ param ], stagedParams[ param ] ) )
-            {
-                // TODO - should never get here - s/w fault?
-            }
+            setCriticalData( &treatmentParameters[ param ], stagedParams[ param ] );
         }
         // Retain original settings for treatment that may be adjusted later during treatment
         origTreatmentParams.bloodFlowRate_mL_min = getCriticalData( &treatmentParameters[ TREATMENT_PARAM_BLOOD_FLOW ] ).uInt;
@@ -346,6 +350,16 @@
         origTreatmentParams.venousPressureLowLimit_mmHg = getCriticalData( &treatmentParameters[ TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT ] ).sInt;
         origTreatmentParams.venousPressureHighLimit_mmHg = getCriticalData( &treatmentParameters[ TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT ] ).sInt;
 
+        // If using Heparin in this treatment, set state to stopped otherwise off
+        if ( ( stagedParams[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].sFlt > 0.0 ) || ( stagedParams[ TREATMENT_PARAM_HEPARIN_DISPENSE_RATE ].sFlt > 0.0 ) )
+        {
+            setHeparinStopped();
+        }
+        else
+        {
+            setHeparinOff();
+        }
+
         // Go to pre-treatment mode
         requestNewOperationMode( MODE_PRET );
 
@@ -593,11 +607,12 @@
  *************************************************************************/
 static void sendTreatmentParamsResponse( BOOL rejected, U32 *reasons )
 {
+    BOOL accepted = ( TRUE == rejected ? FALSE : TRUE );
     U32 respPayload[NUM_OF_TREATMENT_PARAMS];
 
     memcpy( &respPayload[0], &reasons[0], sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) );
 
-    sendTreatmentParametersResponseMsg( rejected, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) * sizeof(U32) ); // UF vol. param not included in reject reasons
+    sendTreatmentParametersResponseMsg( accepted, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) * sizeof(U32) ); // UF vol. param not included in reject reasons
 }
 
 /*********************************************************************//**