Index: HDDefs.h
===================================================================
diff -u -rc1f28621ec5b4ca6ea1902e91de1abf4207ad934 -r02e2e94dac9198194fffab0b249cb6ce1d6d3707
--- HDDefs.h	(.../HDDefs.h)	(revision c1f28621ec5b4ca6ea1902e91de1abf4207ad934)
+++ HDDefs.h	(.../HDDefs.h)	(revision 02e2e94dac9198194fffab0b249cb6ce1d6d3707)
@@ -7,8 +7,8 @@
 *
 * @file    HDDefs.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      07-Feb-2023
+* @author  (last)      Sean Nash
+* @date    (last)      13-Mar-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -750,6 +750,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 +778,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