Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67)
@@ -7,8 +7,8 @@
 *
 * @file    Rinseback.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      02-Nov-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      19-Jan-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  20-Jan-2021
@@ -280,6 +280,8 @@
  *************************************************************************/
 void execRinseback( void )
 {
+    RINSEBACK_STATE_T priorSubState = rinsebackState;
+
     rinsebackTimerCtr++;
 
     switch ( rinsebackState )
@@ -309,6 +311,10 @@
             break;
     }
 
+    if ( priorSubState != rinsebackState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, rinsebackState );
+    }
     // Rinseback flags should be handled by now - reset in case not handled by current state
     resetRinsebackFlags();
 
@@ -497,19 +503,19 @@
     if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
     {
         signalGoToTreatmentStopped();
-        activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM, rinsebackTimerCtr, MAX_RINSEBACK_DONE_TIME );
         clearAlarm( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
     else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
     {
-        activateAlarmNoData( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING, rinsebackTimerCtr, RINSEBACK_DONE_WARNING_TIME );
     }
     // Have we been in this stopped state for too long w/o having delivered full blood volume back to patient?
     else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_TIME ) && ( getRinsebackVolume() < rinsebackTargetVolume_mL ) )
     {
         signalGoToTreatmentStopped();
-        activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM, rinsebackTimerCtr, MAX_RINSEBACK_TIME );
     }
     else if ( TRUE == recircRequested )
     {
@@ -518,7 +524,7 @@
     else if ( TRUE == additionalRinsebackRequested )
     {
         additionalRinsebackRequested = FALSE;
-        // deliver additional rinseback volume only if max volume not reached and max time not reached
+        // deliver additional rinseback volume only if max time not reached or max volume has been reached (i.e. no more blood in line)
         if ( ( rinsebackTimerCtr < MAX_RINSEBACK_TIME ) || ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
         {
             rinsebackAdditionalTimerCtr = 0;
@@ -904,7 +910,7 @@
     {
         *rejReason = REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED;
     }
-    else if ( RINSEBACK_STOP_STATE != rinsebackState )
+    else if ( rinsebackState != RINSEBACK_STOP_STATE )
     {
         *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE;
     }