Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6bd43a5945a9fe619348683bf85591ccd6d5b0d4 -r8254d0eaea0d25b62e41dc4189ec7cabbcf4c226
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6bd43a5945a9fe619348683bf85591ccd6d5b0d4)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8254d0eaea0d25b62e41dc4189ec7cabbcf4c226)
@@ -19,10 +19,12 @@
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
+#include "DrySelfTests.h"
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
+#include "TaskGeneral.h"
 #include "StatePreTxHeparinSetup.h"
 #include "StatePreTxRecirculate.h"
 #include "SyringePump.h"
@@ -40,6 +42,8 @@
 
 // ********** private definitions **********
 
+#define SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+
 /// Interval (ms/task time) at which the Pre-Treatment state data is published on the CAN bus.
 #define PRE_TREATMENT_STATE_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 
@@ -55,7 +59,9 @@
 
 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 Confirm Rx state.
+static BOOL alarmActionResumeReceived;                                      ///< Flag indicates alarm action resume received.
+static U32  submodeCompleteTransitionTimeCounter;                           ///< Sub-mode completed transition wait time counter.
+static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Patient Connection state.
 static BOOL continueFromHeparinSetupRequested;                              ///< Flag indicating a request to transition to Patient Connection state.
 static BOOL treatmentStartRequested;                                        ///< Flag indicating the UI requested treatment start.
 static U32 preTreatmentStateBroadcastTimerCtr;                              ///< Pre-Treatment state data broadcast timer counter.
@@ -69,7 +75,7 @@
 
 static void setPreTreatStateTransition( void );
 static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );
+static TD_PRE_TREATMENT_MODE_STATE_T handleDrySelfTestState( void );
 static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );
 static TD_PRE_TREATMENT_MODE_STATE_T handleRecirculateState( void );
 static TD_PRE_TREATMENT_MODE_STATE_T handleRxState( void );
@@ -88,28 +94,28 @@
 **************************************************************************/
 void initPreTreatmentMode( void )
 {
-    // Start a fresh Treatment Parameters session for this run.
     initTreatmentParameters();
-    initPreTxHeparinSetup();
-
-    currentPreTreatmentState  = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
+    currentPreTreatmentState = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
     goToInstallStateRequested = FALSE;
+    alarmActionResumeReceived = FALSE;
     continueFromRecirculateRequested = FALSE;
     continueFromHeparinSetupRequested = FALSE;
     treatmentStartRequested = FALSE;
+    submodeCompleteTransitionTimeCounter = 0;
     lowQdTransitionActive = FALSE;
     lowQdTransitionStartTime = 0U;
     defaultQdApplied = FALSE;
     preTreatmentRxUpdated = FALSE;
     preTreatmentStateBroadcastTimerCtr = PRE_TREATMENT_STATE_DATA_PUB_INITIAL_OFFSET;
-
     preTreatmentStatePublishInterval = (OVERRIDE_U32_T)
     {
         PRE_TREATMENT_STATE_DATA_PUB_INTERVAL,
         PRE_TREATMENT_STATE_DATA_PUB_INTERVAL,
         PRE_TREATMENT_STATE_DATA_PUB_INTERVAL,
         0
     };
+    initPreTxHeparinSetup();
+    initDrySelfTests();
 }
 
 /*********************************************************************//**
@@ -163,15 +169,14 @@
             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;
 
@@ -202,13 +207,25 @@
     {
         setPreTreatStateTransition();
     }
-
     publishPreTreatmentStates();
 
     return (U32)currentPreTreatmentState;
 }
 
 /*********************************************************************//**
+ * @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 setPreTreatStateTransition function sets the actuators and variables
 * for the state transition in Pre-Treatment mode.
@@ -231,7 +248,7 @@
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
-            // TODO: actuator configuration
+            transitionToDrySelfTests();
             break;
 
         case TD_PRE_TREATMENT_PRIME_STATE:
@@ -273,7 +290,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleInstallState function calls Tube Set Install Service and
  * advances to Self Test Dry state once the service signals
  * completion.
@@ -298,26 +314,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 handleDrySelfTestState 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 == alarmActionResumeReceived )
+    {
+        alarmActionResumeReceived = FALSE;
+        signalResumeDrySelfTests();
+    }
+    execDrySelfTests();
     if ( TRUE == goToInstallStateRequested )
     {
         goToInstallStateRequested = FALSE;
-        initTubeSetInstall();
+
         state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
     }
+    else if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
+    {
+        if ( submodeCompleteTransitionTimeCounter++ >= SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT )
+        {
+            submodeCompleteTransitionTimeCounter = 0;
+            state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+        }
+    }
+    else
+    {
+        submodeCompleteTransitionTimeCounter = 0;
+    }
 
-    // TODO: Transition to Prime state on completion when implemented
-    // state = TD_PRE_TREATMENT_PRIME_STATE;
-
     return state;
 }
 
@@ -676,8 +706,12 @@
             break;
 
         case ALARM_ACTION_RESUME:
-            if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
+            if ( TD_PRE_TREATMENT_SELF_TEST_DRY_STATE == currentPreTreatmentState )
             {
+               signalResumeDrySelfTests();
+            }
+            else if ( TD_PRE_TREATMENT_RECIRCULATE_STATE == currentPreTreatmentState )
+            {
                 signalResumePreTxRecirculate();
             }
             else if ( TD_PRE_TREATMENT_HEPARIN_SETUP_STATE == currentPreTreatmentState )
@@ -686,7 +720,7 @@
             }
             else
             {
-                // No action required.
+                 // No action required.
             }
             break;
 
@@ -726,7 +760,7 @@
 
         payload.mSubMode = (U32)currentPreTreatmentState;
         payload.mInstallState = (U32)getTubeSetInstallState();
-        payload.mSelfTestDryState = 0;
+        payload.mSelfTestDryState = getDrySelfTestsState();
         payload.mPrimeState = 0;
         payload.mRecirculateState = getPreTxRecirculateState();
         payload.mConfirmRxState = 0;