Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r8128289dea98878d92bf170fde1c7145f858baa5 -r351ae8d56096982a68f7df1b69a3bf4dd5785094
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8128289dea98878d92bf170fde1c7145f858baa5)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 351ae8d56096982a68f7df1b69a3bf4dd5785094)
@@ -29,14 +29,14 @@
 
 static BOOL treatStartReqReceived = FALSE;                              ///< Flag indicates user requests treatment begin.
 
-static PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;             ///< Current state of pre-treatment mode state machine.
+static HD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;          ///< Current state of pre-treatment mode state machine.
 
 // ********** private function prototypes **********
 
-static PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void );
-static PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );
-static PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );
-static PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void );
+static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void );
+static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );
+static HD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );
+static HD_PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void );
 
 /*********************************************************************//**
  * @brief
@@ -47,7 +47,7 @@
 *************************************************************************/
 void initPreTreatmentMode( void )
 {
-    currentPreTreatmentState = PRE_TREATMENT_START_STATE;
+    currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
 }
 
 /*********************************************************************//**
@@ -61,7 +61,7 @@
 void transitionToPreTreatmentMode( void )
 {
     treatStartReqReceived = FALSE;
-    currentPreTreatmentState = PRE_TREATMENT_START_STATE;
+    currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
 }
 
 /*********************************************************************//**
@@ -76,46 +76,42 @@
     // execute mode state machine
     switch ( currentPreTreatmentState )
     {
-        case PRE_TREATMENT_START_STATE:
+        case HD_PRE_TREATMENT_START_STATE:
             cmdStartDG();
             cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
-            currentPreTreatmentState = PRE_TREATMENT_WATER_SAMPLE_STATE;
+            currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
             break;
 
-        case PRE_TREATMENT_WATER_SAMPLE_STATE:
-            currentPreTreatmentState = PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
+        case HD_PRE_TREATMENT_WATER_SAMPLE_STATE:
+            currentPreTreatmentState = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
             break;
 
-        case PRE_TREATMENT_SELF_TEST_NO_CART_STATE:
+        case HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE:
             currentPreTreatmentState = handleSelfTestNoCartState();
             break;
 
-        case PRE_TREATMENT_CART_INSTALL_STATE:
-            currentPreTreatmentState = PRE_TREATMENT_SELF_TEST_DRY_STATE;
+        case HD_PRE_TREATMENT_CART_INSTALL_STATE:
+            currentPreTreatmentState = HD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
             break;
 
-        case PRE_TREATMENT_SELF_TEST_DRY_STATE:
+        case HD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
             currentPreTreatmentState = handleSelfTestDryState();
             break;
 
-        case PRE_TREATMENT_PRIME_STATE:
+        case HD_PRE_TREATMENT_PRIME_STATE:
             currentPreTreatmentState = handlePrimeState();
             break;
 
-        case PRE_TREATMENT_SELF_TEST_WET_STATE:
-            currentPreTreatmentState = PRE_TREATMENT_RECIRC_STATE;
+        case HD_PRE_TREATMENT_RECIRCULATE_STATE:
+            currentPreTreatmentState = HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
             break;
 
-        case PRE_TREATMENT_RECIRC_STATE:
-            currentPreTreatmentState = PRE_TREATMENT_PATIENT_CONNECTION_STATE;
-            break;
-
-        case PRE_TREATMENT_PATIENT_CONNECTION_STATE:
+        case HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE:
             currentPreTreatmentState = handlePatientConnectionState();
             break;
 
         default:
-            currentPreTreatmentState = PRE_TREATMENT_START_STATE;
+            currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE, (U32)currentPreTreatmentState );
             break;
     }
@@ -152,7 +148,7 @@
  * @details Outputs: home blood pump and dialysate pumps
  * @return current state (sub-mode)
  *************************************************************************/
-static PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void )
+static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void )
 {
     // TODO: Prompt user to close door
 
@@ -162,27 +158,20 @@
 
     // TODO: Prompt user to open door
 
-    return PRE_TREATMENT_CART_INSTALL_STATE;
+    return  HD_PRE_TREATMENT_CART_INSTALL_STATE;
 }
 
 /*********************************************************************//**
  * @brief
- * The handleSelfTestDryState function handles dry self-test.
+ * The handleSelfTestDryState function handles dry self-tests after cartridge
+ * is loaded.
  * @details Inputs: none
- * @details Outputs: transition to prime sub-mode when blood pump finished homing
+ * @details Outputs: transition to prime state on user request
  * @return current state (sub-mode)
  *************************************************************************/
-static PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void )
+static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void )
 {
-    PRE_TREATMENT_MODE_STATE_T state = PRE_TREATMENT_CART_INSTALL_STATE;
-
-    if ( FALSE == isBloodPumpRunning() )
-    {
-        transitionToPrime();
-        state = PRE_TREATMENT_PRIME_STATE;
-    }
-
-    return state;
+    return HD_PRE_TREATMENT_PRIME_STATE;
 }
 
 /*********************************************************************//**
@@ -192,15 +181,15 @@
  * @details Outputs: transition to self test wet state after priming passed
  * @return current state (sub-mode)
  *************************************************************************/
-static PRE_TREATMENT_MODE_STATE_T handlePrimeState( void )
+static  HD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void )
 {
-    PRE_TREATMENT_MODE_STATE_T state = PRE_TREATMENT_PRIME_STATE;
+    HD_PRE_TREATMENT_MODE_STATE_T state =  HD_PRE_TREATMENT_PRIME_STATE;
 
     execPrime();
 
     if ( TRUE == isPrimingPassed() )
     {
-        state = PRE_TREATMENT_SELF_TEST_WET_STATE;
+        state = HD_PRE_TREATMENT_RECIRCULATE_STATE;
     }
 
     return state;
@@ -214,14 +203,14 @@
  * @details Outputs: requested mode transition to treatment mode
  * @return current state (sub-mode)
  *************************************************************************/
-static PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void )
+static  HD_PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void )
 {
     if ( TRUE == treatStartReqReceived )
     {
         requestNewOperationMode( MODE_TREA );
     }
 
-    return PRE_TREATMENT_PATIENT_CONNECTION_STATE;
+    return  HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
 }
 
 /**@}*/