Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r2f282113c1540be57b9d00833224d7ce93d460cd -r3f032347c774cab541bd9efb143fa874f65d25e9
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 2f282113c1540be57b9d00833224d7ce93d460cd)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3f032347c774cab541bd9efb143fa874f65d25e9)
@@ -21,6 +21,7 @@
 #include "ModePreTreat.h"
 #include "OperationModes.h"
 #include "StatePreTxRecirculate.h"
+#include "StatePreTxHeparinSetup.h"
 #include "Timers.h"
 #include "TubeSetInstall.h"
 #include "TxParams.h"
@@ -35,7 +36,8 @@
 
 static TD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;              ///< Current Pre-Treatment sub-state
 static BOOL goToInstallStateRequested;                                      ///< Flag indicating a request to transition to Install state.
-static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Patient Connection state.
+static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Confirm Rx state.
+static BOOL continueFromHeparinSetupRequested;                              ///< Flag indicating a request to transition to Patient Connection state.
 
 // ********** private function prototypes **********
 
@@ -47,6 +49,7 @@
 static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );              ///< Handle Prime state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleRecirculateState( void );        ///< Handle Recirculate state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleRxState( void );                 ///< Handle Confirm Rx state during Pre-Treatment
+static TD_PRE_TREATMENT_MODE_STATE_T handleHeparinSetupState( void );       ///< Handle Heparin Setup state during Pre-Treatment.
 static TD_PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void );  ///< Handle Patient Connection state during Pre-Treatment
 
 /*********************************************************************//**
@@ -64,6 +67,7 @@
     currentPreTreatmentState  = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
     goToInstallStateRequested = FALSE;
     continueFromRecirculateRequested = FALSE;
+    continueFromHeparinSetupRequested = FALSE;
 }
 
 /*********************************************************************//**
@@ -144,6 +148,10 @@
             currentPreTreatmentState = handleRecirculateState();
             break;
 
+        case TD_PRE_TREATMENT_HEPARIN_SETUP_STATE:
+            currentPreTreatmentState = handleHeparinSetupState();
+            break;
+
         case TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE:
             // currentPreTreatmentState = handlePatientConnectionState();
             break;
@@ -307,6 +315,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleHeparinSetupState function executes the Heparin Setup state of
+ * pre-treatment mode.
+ * @details \b Inputs: continueFromHeparinSetupRequested.
+ * @details \b Outputs: continueFromHeparinSetupRequested
+ * @return next Pre-Treatment mode state.
+ *************************************************************************/
+static TD_PRE_TREATMENT_MODE_STATE_T handleHeparinSetupState( void )
+{
+    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_HEPARIN_SETUP_STATE;
+
+    execPreTxHeparinSetup();
+
+    if ( TRUE == continueFromHeparinSetupRequested )
+    {
+        continueFromHeparinSetupRequested = FALSE;
+        state = TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
+
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleRxState function executes the Confirm Rx pre-treatment step.
  * @details \b Inputs: none
  * @details \b Outputs: Requests transition to the next Pre-Treatment state when the prescription
@@ -395,6 +427,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The PreTxRequestContinueFromHeparinSetupRequested function signals a request to
+ * transition the Pre-Treatment mode state machine to Patient Connection state.
+ * @details \b Inputs: none
+ * @details \b Outputs: continueFromHeparinSetupRequested
+ * @return none
+ *************************************************************************/
+void PreTxRequestContinueFromHeparinSetupRequested( void )
+{
+    continueFromHeparinSetupRequested = TRUE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalAlarmActionToPreTreatmentMode function executes the given alarm action
  * as appropriate while in Pre-Treatment Mode.
  * @details \b Inputs: currentPreTreatmentState
@@ -411,11 +456,16 @@
             break;
 
         case ALARM_ACTION_RESUME:
-             if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
-             {
+            if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
+            {
                 signalResumePreTxRecirculate();
-             }
-             break;
+            }
+            else if ( TD_PRE_TREATMENT_HEPARIN_SETUP_STATE == currentPreTreatmentState )
+            {
+                signalResumePreTxHeparinSetup();
+                signalPreTxHeparinSyringeLoadConfirmed();
+            }
+            break;
 
         default:
             // do not handle other actions in pre-treatment mode