Index: firmware/App/Modes/PreTreatmentRecirc.c
===================================================================
diff -u -rb2ec7321d2fcfa74b7056ea77f9f36e8bc0a288f -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision b2ec7321d2fcfa74b7056ea77f9f36e8bc0a288f)
+++ firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    PreTreatmentRecirc.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      02-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      09-Jun-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  08-Feb-2021
@@ -68,7 +68,6 @@
     preTxRecircStartTime = getMSTimerCount();
     recircTOWarningGiven = FALSE;
     recircTOAlarmGiven = FALSE;
-
     resetPreTreatmentRecircFlags();
 }
 
@@ -84,6 +83,7 @@
 {
     initPreTreatmentRecirc();
     setupPreTreatmentRecirculate();
+    setCurrentSubState( (U32)currentPreTreatmentRecircState );
 }
 
 /*********************************************************************//**
@@ -101,8 +101,8 @@
     if ( ( recircTOAlarmGiven != TRUE ) && ( TRUE == didTimeout( preTxRecircStartTime, WARNING_HIGH_PRIME_COMPLETED_TIME_MS ) ) )
     {
         recircTOAlarmGiven = TRUE;
-        clearAlarm( ALARM_ID_PRIME_COMPLETED_MEDIUM );
-        activateAlarmNoData( ALARM_ID_PRIME_COMPLETED_HIGH );
+        clearAlarm( ALARM_ID_HD_PRIME_COMPLETED_MEDIUM );
+        activateAlarmNoData( ALARM_ID_HD_PRIME_COMPLETED_HIGH );
     }
 
     // execute pre-treatment recirculate state machine
@@ -123,6 +123,7 @@
 
     if ( priorSubState != currentPreTreatmentRecircState )
     {
+        setCurrentSubState( (U32)currentPreTreatmentRecircState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentPreTreatmentRecircState );
     }
     // All flags should be handled by now, reset in case flags not handle in current state
@@ -192,7 +193,6 @@
     setValveAirTrap( STATE_CLOSED );
     cmdSetDGActiveReservoir( &rsrvrCmd );
     cmdStartDGTrimmerHeater();
-    startAirTrapControl();
 
     setBloodPumpTargetFlowRate( BLOOD_PUMP_RECIRC_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     setDialInPumpTargetFlowRate( DIALYSATE_PUMP_RECIRC_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
@@ -215,8 +215,8 @@
     if ( ( recircTOWarningGiven != TRUE ) && ( TRUE == didTimeout( preTxRecircStartTime, WARNING_MEDIUM_PRIME_COMPLETED_TIME_MS ) ) )
     {
         recircTOWarningGiven = TRUE;
-        clearAlarm( ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY );
-        activateAlarmNoData( ALARM_ID_PRIME_COMPLETED_MEDIUM );
+        clearAlarm( ALARM_ID_HD_PRIME_COMPLETED_LOW_PRIORITY );
+        activateAlarmNoData( ALARM_ID_HD_PRIME_COMPLETED_MEDIUM );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )