Index: firmware/App/Modes/PreTreatmentRecirc.c
===================================================================
diff -u -r370bc7a1f01c324688991b474c73489aa3a74565 -rf760ffc4b10556e5186e9ceb90294262063440ca
--- firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision 370bc7a1f01c324688991b474c73489aa3a74565)
+++ firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2023 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)      13-Jul-2022
+* @date    (last)      02-Feb-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  08-Feb-2021
@@ -22,6 +22,8 @@
 #include "DGInterface.h"
 #include "PreTreatmentRecirc.h"
 #include "Switches.h"
+#include "SystemCommMessages.h"
+#include "Timers.h"
 #include "Valves.h"
 
 /**
@@ -31,14 +33,19 @@
 
 // ********** private definitions **********
 
-#define BLOOD_PUMP_RECIRC_FLOW_RATE                         100                 ///< Blood pump flow rate during recirculation in mL/min.
-/// TODO: Restore to 100 when DPi flow control is fixed.
-#define DIALYSATE_PUMP_RECIRC_FLOW_RATE                     250                 ///< Dialysate pump flow rate during recirculation in mL/min.
+#define BLOOD_PUMP_RECIRC_FLOW_RATE                         100                             ///< Blood pump flow rate during recirculation in mL/min.
+// TODO: Restore to 100 when DPi flow control is fixed.
+#define DIALYSATE_PUMP_RECIRC_FLOW_RATE                     250                             ///< Dialysate pump flow rate during recirculation in mL/min.
+#define WARNING_MEDIUM_PRIME_COMPLETED_TIME_MS              ( 90 * 60 * MS_PER_SECOND )     ///< Pre-Treatment recirc time before medium priority warning in min.
+#define WARNING_HIGH_PRIME_COMPLETED_TIME_MS                ( 120 * 60 * MS_PER_SECOND )    ///< Pre-Treatment recirc time before high priority alarm in min.
 
 // ********** private data **********
 
-static HD_PRE_TREATMENT_RECIRC_STATE_T currentPreTreatmentRecircState;          ///< Current state of the pre-treatment recirculate state machine.
-static BOOL recircResumeRequested;                                              ///< Flag indicates alarm requesting to resume pre-treatment recirculate.
+static HD_PRE_TREATMENT_RECIRC_STATE_T currentPreTreatmentRecircState;                      ///< Current state of the pre-treatment recirculate state machine.
+static BOOL recircResumeRequested;                                                          ///< Flag indicates alarm requesting to resume pre-treatment recirculate.
+static U32  preTxRecircStartTime;                                                           ///< Time pre-treatment re-circulate state started.
+static BOOL recircTOWarningGiven;                                                           ///< Flag indicates 90 minute warning given.
+static BOOL recircTOAlarmGiven;                                                             ///< Flag indicates 2 hour alarm triggered.
 
 // ********** private function prototypes **********
 
@@ -58,6 +65,9 @@
 void initPreTreatmentRecirc( void )
 {
     currentPreTreatmentRecircState = PRE_TREATMENT_RECIRC_STATE;
+    preTxRecircStartTime = getMSTimerCount();
+    recircTOWarningGiven = FALSE;
+    recircTOAlarmGiven = FALSE;
 
     resetPreTreatmentRecircFlags();
 }
@@ -85,6 +95,16 @@
  *************************************************************************/
 void execPreTreatmentRecirc( void )
 {
+    HD_PRE_TREATMENT_RECIRC_STATE_T priorSubState = currentPreTreatmentRecircState;
+
+    // Alarm if 2 hours recirculating
+    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 );
+    }
+
     // execute pre-treatment recirculate state machine
     switch ( currentPreTreatmentRecircState )
     {
@@ -101,6 +121,10 @@
             break;
     }
 
+    if ( priorSubState != 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
     resetPreTreatmentRecircFlags();
 }
@@ -154,14 +178,19 @@
  *************************************************************************/
 static void setupPreTreatmentRecirculate( void )
 {
+    DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+    rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_1;
+    rsrvrCmd.useLastTrimmerHeaterDC = FALSE;
+
     doorClosedRequired( TRUE, TRUE );
 
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
     setValvePosition( VBA, VALVE_POSITION_B_OPEN );
     setValvePosition( VBV, VALVE_POSITION_B_OPEN );
     setValveAirTrap( STATE_CLOSED );
-    cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+    cmdSetDGActiveReservoir( &rsrvrCmd );
     cmdStartDGTrimmerHeater();
     startAirTrapControl();
 
@@ -182,6 +211,14 @@
 {
     HD_PRE_TREATMENT_RECIRC_STATE_T state = PRE_TREATMENT_RECIRC_STATE;
 
+    // Warn user if 90 minutes recirculating
+    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 );
+    }
+
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         signalDialOutPumpHardStop();