Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r844f98879b7425c207b58562e623ab960adbc357 -r994dd4e7cb997f5d280180ff48ecec9d3963001a
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 844f98879b7425c207b58562e623ab960adbc357)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 994dd4e7cb997f5d280180ff48ecec9d3963001a)
@@ -125,6 +125,7 @@
     signalDialOutPumpHardStop();
     stopSyringePump();
     setBloodPumpTargetFlowRate( TX_END_BP_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    cmdStopDGTrimmerHeater();
 
     // Continue air trap control
     startAirTrapControl();
@@ -146,6 +147,8 @@
  *************************************************************************/
 static void setupForTxEndWait4RinsebackState( void )
 {
+    // No resume alarm action allowed
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     // Open VBA and VBV valves to allow flow from saline bag and to patient venous line
     setValvePosition( VBA, VALVE_POSITION_B_OPEN );
     setValvePosition( VBV, VALVE_POSITION_B_OPEN );
@@ -167,6 +170,8 @@
  *************************************************************************/
 static void setupForTxEndPausedState( void )
 {
+    // Resume alarm action will take us back to TxEndWait4RinsebackState
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     // Stop blood pump
     signalBloodPumpHardStop();
     // Close arterial and venous lines
@@ -279,12 +284,12 @@
         // Ensure we do not sit in stopped state for too long
         if ( bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
         {
-            activateAlarmNoData( ALARM_ID_BLOOD_SITTING_WARNING );
+            activateAlarmNoData( ALARM_ID_END_OF_TREATMENT_ALARM );
         }
         if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
         {
             // Raise the alarm
-            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
+            activateAlarmNoData( ALARM_ID_END_OF_TREATMENT_HIGH );
         }
     }