Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r9bc5e72e777b0bf72807428e40450705b1eef321 -r565ed0856be2fcf1443e3ec4cb8fe023b2c14db4
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 9bc5e72e777b0bf72807428e40450705b1eef321)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 565ed0856be2fcf1443e3ec4cb8fe023b2c14db4)
@@ -88,7 +88,7 @@
 // ********** private function prototypes **********
 
 static void resetPrimeFlags();
-static void handlePrimePauseRequest( void );
+static void setupForPrimePause( void );
 static void broadcastPrimingStatus( void );
 static void purgeAirValvesBloodPumpControl( void );
 
@@ -212,9 +212,6 @@
     // Prime flags should be handled by now
     resetPrimeFlags();
 
-    // Handle prime pause request
-    handlePrimePauseRequest();
-
     // Broadcast priming data
     broadcastPrimingStatus();
 }
@@ -282,23 +279,19 @@
 
 /*********************************************************************//**
  * @brief
- * The handlePrimePauseRequest function handles prime pause request.
+ * The setupForPrimePause function stop pumps handles prime pause request.
  * @details Inputs: none
  * @details Outputs: stop all pumps, switch to prime pause state.
  * @return none
  *************************************************************************/
-static void handlePrimePauseRequest( void )
+static void setupForPrimePause( void )
 {
-    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( HD_PRIME_PAUSE != currentPrimeState ) )
-    {
-        signalDialOutPumpHardStop();
-        signalDialInPumpHardStop();
-        signalBloodPumpHardStop();
+    signalDialOutPumpHardStop();
+    signalDialInPumpHardStop();
+    signalBloodPumpHardStop();
 
-        primePauseStartTime = getMSTimerCount();
-        previousPrimeState  = currentPrimeState;
-        currentPrimeState   = HD_PRIME_PAUSE;
-    }
+    primePauseStartTime = getMSTimerCount();
+    previousPrimeState  = currentPrimeState;
 }
 
 /*********************************************************************//**
@@ -384,10 +377,18 @@
  *************************************************************************/
 static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeSalineSetupState( void )
 {
+    HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_SALINE_PURGE_AIR_STATE;
+
     purgeAirValvesBloodPumpControl();
     purgeAirTimeOutStartTime = getMSTimerCount();
 
-    return HD_PRIME_SALINE_PURGE_AIR_STATE;
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
+    return state;
 }
 
 /*********************************************************************//**
@@ -420,6 +421,12 @@
         state = HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }
 
@@ -449,6 +456,12 @@
         state = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }
 
@@ -466,26 +479,37 @@
 
     if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_1 ) )
     {
-        setValvePosition( VDI, VALVE_POSITION_B_OPEN );
-        setValvePosition( VDO, VALVE_POSITION_B_OPEN );
-        setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-        setValveAirTrap( STATE_CLOSED );
+        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
 
-        setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialOutPumpTargetRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        {
+            setValvePosition( VDI, VALVE_POSITION_B_OPEN );
+            setValvePosition( VDO, VALVE_POSITION_B_OPEN );
+            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+            setValveAirTrap( STATE_CLOSED );
 
-        previousLoadCellReading = 0;
-        loadcellSteadyVolumeStartTime = getMSTimerCount();
-        primeDialysateDialyzerStartTime = getMSTimerCount();
+            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            setDialOutPumpTargetRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
-#ifdef SKIP_PRIMING
-        state = HD_PRIME_WET_SELF_TESTS_STATE;
-#else
-        state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
-#endif
+            previousLoadCellReading = 0;
+            loadcellSteadyVolumeStartTime = getMSTimerCount();
+            primeDialysateDialyzerStartTime = getMSTimerCount();
+
+    #ifdef SKIP_PRIMING
+            state = HD_PRIME_WET_SELF_TESTS_STATE;
+    #else
+            state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
+    #endif
+        }
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }
 
@@ -522,6 +546,12 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT, PRIME_DIALYSATE_DIALYZER_TIME_LIMIT );
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }
 
@@ -539,21 +569,32 @@
 
     if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_2 ) )
     {
-        signalDialOutPumpHardStop();
-        setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
 
-        setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-        setValveAirTrap( STATE_CLOSED );
+        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        {
+            signalDialOutPumpHardStop();
+            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
-        previousLoadCellReading = 0;
-        primeDialysateBypassStartTime = getMSTimerCount();
-        loadcellSteadyVolumeStartTime = getMSTimerCount();
-        state = HD_PRIME_DIALYSATE_BYPASS_STATE;
+            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+            setValveAirTrap( STATE_CLOSED );
+
+            previousLoadCellReading = 0;
+            primeDialysateBypassStartTime = getMSTimerCount();
+            loadcellSteadyVolumeStartTime = getMSTimerCount();
+            state = HD_PRIME_DIALYSATE_BYPASS_STATE;
+        }
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }
 
@@ -590,6 +631,12 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }
 
@@ -619,6 +666,12 @@
         state = HD_PRIME_COMPLETE;
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        setupForPrimePause();
+        state = HD_PRIME_PAUSE;
+    }
+
     return state;
 }