Index: HDDefs.h
===================================================================
diff -u -rc1f28621ec5b4ca6ea1902e91de1abf4207ad934 -r322f297e3a0edc25a9cc5e672493f2ebb1ba974d
--- HDDefs.h	(.../HDDefs.h)	(revision c1f28621ec5b4ca6ea1902e91de1abf4207ad934)
+++ HDDefs.h	(.../HDDefs.h)	(revision 322f297e3a0edc25a9cc5e672493f2ebb1ba974d)
@@ -7,8 +7,8 @@
 *
 * @file    HDDefs.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      07-Feb-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      20-Mar-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -394,6 +394,9 @@
     DIALYSIS_START_STATE = 0,                           ///< Start state of the dialysis sub-mode state machine
     DIALYSIS_UF_STATE,                                  ///< Ultrafiltration state of the dialysis sub-mode state machine
     DIALYSIS_SALINE_BOLUS_STATE,                        ///< Saline bolus state of the dialysis sub-mode state machine
+#ifdef DIALYZER_REPRIME_ENABLED
+    DIALYSIS_DIALYZER_REPRIME_STATE,                    ///< Dialyzer reprime state of the dialysis sub-mode state machine
+#endif
     NUM_OF_DIALYSIS_STATES                              ///< Number of dialysis sub-mode states
 };
 typedef enum Dialysis_States DIALYSIS_STATE_T;          ///< Type for dialysis states enumeration
@@ -427,6 +430,20 @@
 };
 typedef enum Saline_Commands SALINE_CMD_T;              ///< Type for saline command enum.
 
+#ifdef DIALYZER_REPRIME_ENABLED
+/// Enumeration of dialyzer reprime states.
+enum Dialyzer_Reprime_States
+{
+    DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF = 0,             ///< Turn off dialysate pumps and wait for them to stop
+    DIALYZER_REPRIME_STATE_PURGE_PRIOR_1,                       ///< Purge air from an interrupted reprime
+    DIALYZER_REPRIME_STATE_PURGE_PRIOR_2,                       ///< Purge air from an interrupted reprime
+    DIALYZER_REPRIME_STATE_REPRIME,                             ///< Remove air from dialyzer
+    DIALYZER_REPRIME_STATE_PURGE_LINES,                         ///< Purge air from lines after repriming dialyzer
+    NUM_OF_DIALYZER_REPRIME_STATES                              ///< Number of dialyzer reprime states
+};
+typedef enum Dialyzer_Reprime_States DIALYZER_REPRIME_STATE_T;  ///< Type for dialyzer reprime state enumeration
+#endif
+
 /// Enumeration of ultrafiltration command IDs.
 enum UF_Commands
 {
@@ -750,6 +767,8 @@
     HD_EVENT_SUB_STATE_CHANGE,                                          ///< HD Op sub-state change event
     HD_EVENT_SYRINGE_PUMP_STATE,                                        ///< HD syringe pump state change event
     HD_EVENT_OCCLUSION_BASELINE,                                        ///< HD event occlusion baseline event
+    HD_EVENT_RSRVR_UF_VOLUME_AND_TIME,                                  ///< HD ultrafiltration volume and time for a reservoir use
+    HD_EVENT_RSRVR_UF_RATE,                                             ///< HD ultrafiltration measured and expected rates
     NUM_OF_EVENT_IDS                                                    ///< Total number of HD events
 };
 typedef enum HD_Event_List HD_EVENT_ID_T;                               ///< Type for HD event list enumeration
@@ -776,9 +795,12 @@
 enum Generic_Confirm_Id
 {
     GENERIC_CONFIRM_ID_NONE = 0,                                        ///< Generic Confirm None
-    GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH,                       ///< water flush        stop user confirmation
-    GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT,                             ///< Heat disinfect     stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH,                       ///< Water flush stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT,                             ///< Heat disinfect stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL,                         ///< Chemical disinfect stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH,                   ///< Chemical disinfect flush stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL,           ///< Chemical disinfect sample flush pass/fail
+    GENERIC_CONFIRM_ID_TREATMENT_END,                                   ///< End treatment user confirmation
     NUM_OF_GENERIC_CONFIRM_IDS,                                         ///< Total number of generic confirm IDs
 };
 typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T;                   ///< Type for generic confirm enumeration