Index: HDDefs.h
===================================================================
diff -u -r4b9d1e81e6c44a6a23bc9b6898685793c1dc25f5 -rf2468224a62aff2dd056f9205b2962b6edd8b75f
--- HDDefs.h	(.../HDDefs.h)	(revision 4b9d1e81e6c44a6a23bc9b6898685793c1dc25f5)
+++ HDDefs.h	(.../HDDefs.h)	(revision f2468224a62aff2dd056f9205b2962b6edd8b75f)
@@ -7,8 +7,8 @@
 *
 * @file    HDDefs.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      14-Jun-2022
+* @author  (last)      Sean Nash
+* @date    (last)      02-Aug-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -53,7 +53,6 @@
 {
     POST_STATE_START = 0,                               ///< Start initialize & POST mode state
     POST_STATE_FW_INTEGRITY,                            ///< Run firmware integrity test state
-    POST_STATE_AC,                                      ///< Check HD has AC power - power off if not
     POST_STATE_WATCHDOG,                                ///< Run watchdog test state
     POST_STATE_SAFETY_SHUTDOWN,                         ///< Run safety shutdown test state
     POST_STATE_RTC,                                     ///< Run RTC test state
@@ -105,7 +104,7 @@
 /// Sub-mode states while in standby mode
 enum HD_Standby_States
 {
-    STANDBY_START_STATE = 0,                                 ///< Start standby.
+    STANDBY_START_STATE = 0,                                 ///< Start standby (home actuators).
     STANDBY_WAIT_FOR_TREATMENT_STATE,                        ///< Wait for treatment.
     STANDBY_WAIT_FOR_DISINFECT_STATE,                        ///< Wait for UI to send disinfect option.
 
@@ -644,6 +643,7 @@
     DIALYZER_TYPE_BBRAUN_PRO_19H,                                       ///< BBraun Diacap Pro 19H
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE,                           ///< Fresenius Optiflux F160NRe
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE,                           ///< Fresenius Optiflux F180NRe
+    DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F200NRE,                           ///< Fresenius Optiflux F200NRe
     NUM_OF_DIALYZER_TYPES                                               ///< Number of dialyzer types
 };
 typedef enum Dialyzer_Types DIALYZER_TYPE_T;                            ///< Type for dialyzer types enumeration
@@ -727,6 +727,9 @@
     HD_EVENT_STARTUP = 0,                                               ///< HD startup event
     HD_EVENT_OP_MODE_CHANGE,                                            ///< HD Op mode change event
     HD_EVENT_SUB_MODE_CHANGE,                                           ///< HD Op sub-mode change event
+    HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,
+    HD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT,
+    HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,
     NUM_OF_EVENT_IDS                                                    ///< Total number of HD events
 };
 typedef enum HD_Event_List HD_EVENT_ID_T;                               ///< Type for HD event list enumeration