Index: HDDefs.h
===================================================================
diff -u -r25469667abdf600e0a8b6580ca37d36f595d4a5d -rde163bd40f302115eaeaa7e3db8757225c0cc8ba
--- HDDefs.h	(.../HDDefs.h)	(revision 25469667abdf600e0a8b6580ca37d36f595d4a5d)
+++ HDDefs.h	(.../HDDefs.h)	(revision de163bd40f302115eaeaa7e3db8757225c0cc8ba)
@@ -8,7 +8,7 @@
 * @file    HDDefs.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      09-Mar-2022
+* @date    (last)      23-Mar-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -225,10 +225,7 @@
 {
     NO_CART_SELF_TESTS_START_STATE = 0,                     ///< No cartridge self-tests starting state
     NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,           ///< Wait for door to be closed before running self-tests
-    NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE,             ///< No cartridge occlusion sensors self-test state
-    NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE,             ///< No cartridge blood flow meter self-test state
-    NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE,         ///< No cartridge dialysate flow meter self-test state
-    NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE,             ///< No cartridge board temperature self-test state
+    NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE,               ///< No cartridge pressure sensors self-test state
     NO_CART_SELF_TESTS_HOME_VALVES_STATE,                   ///< No cartridge home valves state
     NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE,             ///< No cartridge home syringe pump state
     NO_CART_SELF_TESTS_PUMPS_STATE,                         ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state
@@ -694,12 +691,17 @@
     DIALYSATE_FLOW_RATE_CHANGE_EVENT,                                   ///< Dialysate flow rate change event
     TREATMENT_DURATION_CHANGE_EVENT,                                    ///< Treatment duration change event
     UF_VOLUME_CHANGE_EVENT,                                             ///< Ultrafiltration volume change event
-    UF_PAUSE_RESUME_EVENT,                                              ///< Ultrafiltration pause/resume event
+    UF_RATE_CHANGE_EVENT,                                               ///< Ultrafiltration rate change event
+    UF_START_RESUME_EVENT,                                              ///< Ultrafiltration start or resume event
+    UF_PAUSE_EVENT,                                                     ///< Ultrafiltration pause event
     ARTERIAL_PRESSURE_LOWER_LIMIT_CHANGE_EVENT,                         ///< Arterial pressure lower limit change event
     ARTERIAL_PRESSURE_UPPER_LIMIT_CHANGE_EVENT,                         ///< Arterial pressure upper limit change event
     VENOUS_PRESSURE_LOWER_LIMIT_CHANGE_EVENT,                           ///< Venous pressure lower limit change event
     VENOUS_PRESSURE_UPPER_LIMIT_CHANGE_EVENT,                           ///< Venous pressure upper limit change event
-    HEPARIN_PAUSE_RESUME_EVENT,                                         ///< Heparin pause/resume event
+    HEPARIN_BOLUS_START_EVENT,                                          ///< Heparin bolus start event
+    HEPARIN_BOLUS_END_EVENT,                                            ///< Heparin bolus end event
+    HEPARIN_START_RESUME_EVENT,                                         ///< Heparin start or resume event
+    HEPARIN_STOP_PAUSE_EVENT,                                           ///< Heparin stop or pause event
     SALINE_BOLUSES_CHANGE_EVENT,                                        ///< Saline boluses change event
     MID_TREATMENT_RINSE_BACK_EVENT,                                     ///< Mid treatment rinse-back event
     NUM_OF_TX_EVENT_IDS                                                 ///< Total number of treatment events