Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r2f282113c1540be57b9d00833224d7ce93d460cd -r927dfd6e109af46160e5aef687f1b7c286d24703
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 2f282113c1540be57b9d00833224d7ce93d460cd)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 927dfd6e109af46160e5aef687f1b7c286d24703)
@@ -17,10 +17,15 @@
 
 #include "BloodFlow.h"
 #include "Buttons.h"
+#include "DrySelfTests.h"
 #include "DDInterface.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
+<<<<<<< HEAD
+#include "TaskGeneral.h"
+=======
 #include "StatePreTxRecirculate.h"
+>>>>>>> 0904e146ed12daa575b419612f5cdef5000fd0f5
 #include "Timers.h"
 #include "TubeSetInstall.h"
 #include "TxParams.h"
@@ -31,23 +36,33 @@
  *  @{
  */
 
+// ********** private definitions **********
+
+#define SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+
 // ********** private data **********
 
 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.
+<<<<<<< HEAD
+static BOOL alarmActionResumeReceived;                                      ///< Flag indicates alarm action resume received.
+static BOOL tubeSetInstallRequested;                                        ///< Request to re-enter install flow (mid-treatment / failure)
+static U32  submodeCompleteTransitionTimeCounter;                           ///< Sub-mode completed transition wait time counter.
+=======
 static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Patient Connection state.
+>>>>>>> 0904e146ed12daa575b419612f5cdef5000fd0f5
 
 // ********** private function prototypes **********
 
 static TD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void );        ///< Handle Water Sample state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestConsumableState( void ); ///< Handle Self Test Consumable state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void );     ///< Handle Self Test No Cart state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );            ///< Handle Install state during Pre-Treatment
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );        ///< Handle Self Test Dry state during Pre-Treatment
 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 handlePatientConnectionState( void );  ///< Handle Patient Connection state during Pre-Treatment
+static TD_PRE_TREATMENT_MODE_STATE_T handleDrySelfTestState( void );        ///< Handle dry self tests state during Pre-Treatment
 
 /*********************************************************************//**
 * @brief
@@ -112,31 +127,30 @@
     switch ( currentPreTreatmentState )
     {
         case TD_PRE_TREATMENT_WATER_SAMPLE_STATE:
-            // currentPreTreatmentState = handleWaterSampleState();
+            currentPreTreatmentState = handleWaterSampleState();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE:
-            // currentPreTreatmentState = handleSelfTestConsumableState();
+            currentPreTreatmentState = handleSelfTestConsumableState();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE:
-            // currentPreTreatmentState = handleSelfTestNoCartState();
+            currentPreTreatmentState = handleSelfTestNoCartState();
             break;
 
         case TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE:
             currentPreTreatmentState = handleInstallState();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
-            // currentPreTreatmentState = handleSelfTestDryState();
+            currentPreTreatmentState = handleDrySelfTestState();
             break;
 
         case TD_PRE_TREATMENT_PRIME_STATE:
-            // currentPreTreatmentState = handlePrimeState();
+            currentPreTreatmentState = handlePrimeState();
             break;
 
         case TD_PRE_TREATMENT_CONFIRM_RX_STATE:
-            // Confirm Rx state
             currentPreTreatmentState = handleRxState();
             break;
 
@@ -145,7 +159,7 @@
             break;
 
         case TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE:
-            // currentPreTreatmentState = handlePatientConnectionState();
+            currentPreTreatmentState = handlePatientConnectionState();
             break;
 
         default:
@@ -158,6 +172,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getPreTreatmentSubState function gets the current
+ * pre-treatment mode state.
+ * @details \b Inputs: currentPreTreatmentState
+ * @details \b Outputs: none
+ * @return currentPreTreatmentState
+ *************************************************************************/
+TD_PRE_TREATMENT_MODE_STATE_T getPreTreatmentSubState( void )
+{
+    return currentPreTreatmentState;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleWaterSampleState function executes the Water Sample state of
  * pre-treatment mode.
  * @details \b Inputs: TODO fill up if any
@@ -211,7 +238,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleInstallState function calls Tube Set Install Service and
  * advances to Self Test Dry state once the service signals
  * completion.
@@ -236,26 +262,40 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSelfTestDryState function executes the Self Test Dry state
- * of pre-treatment mode.
- * @details \b Inputs: TODO fill up if any
- * @details \b Outputs: TODO fill up if any
- * @return next Pre-Treatment mode state.
+ * The handleSelfTestDryState function performs dry self-test.
+ * @details \b Inputs: none
+ * @details \b Outputs: transition to prime state on user request
+ * @return current state (sub-mode)
  *************************************************************************/
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void )
+static TD_PRE_TREATMENT_MODE_STATE_T handleDrySelfTestState( void )
 {
     TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
 
-    if ( TRUE == goToInstallStateRequested )
+    if ( TRUE == alarmActionResumeReceived )
     {
-        goToInstallStateRequested = FALSE;
-        initTubeSetInstall();
-        state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
+        alarmActionResumeReceived = FALSE;
+        signalResumeDrySelfTests();
     }
 
-    // TODO: Transition to Prime state on completion when implemented
-    // state = TD_PRE_TREATMENT_PRIME_STATE;
+    execDrySelfTests();
 
+    // Handle install request to failure path
+    if ( TRUE == tubeSetInstallRequested )
+    {
+        tubeSetInstallRequested = FALSE;
+        state = TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
+    }
+
+    if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
+    {
+        if ( submodeCompleteTransitionTimeCounter++ >= SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT )
+        {
+            submodeCompleteTransitionTimeCounter = 0;
+            state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+            // TODO
+//            transitionToPrime();
+        }
+    }
     return state;
 }