Index: HDDefs.h
===================================================================
diff -u -rf2468224a62aff2dd056f9205b2962b6edd8b75f -r0eb8088552042670ec2b088456d64864095d5774
--- HDDefs.h	(.../HDDefs.h)	(revision f2468224a62aff2dd056f9205b2962b6edd8b75f)
+++ HDDefs.h	(.../HDDefs.h)	(revision 0eb8088552042670ec2b088456d64864095d5774)
@@ -7,8 +7,8 @@
 *
 * @file    HDDefs.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      02-Aug-2022
+* @author  (last)      Dong Nguyen
+* @date    (last)      08-Sep-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -89,7 +89,9 @@
 /// Enumeration of fault mode states.
 enum HD_Fault_States
 {
-    HD_FAULT_STATE_START = 0,                           ///< Start fault state
+    HD_FAULT_STATE_START = 0,                           ///< HD fault start state
+    HD_FAULT_STATE_RUN_NV_POSTS,                        ///< HD fault run NV posts state
+    HD_FAULT_STATE_COMPLETE,                            ///< HD fault run complete state
     NUM_OF_HD_FAULT_STATES                              ///< Number of fault mode states
 };
 typedef enum HD_Fault_States HD_FAULT_STATE_T;          ///< Type for HD fault states enumeration
@@ -244,7 +246,9 @@
     DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,              ///< Used cartridge check dry self-test state
     DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE,                 ///< Occlusion sensors dry self-test state
     DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE,            ///< Pressure sensors dry self-test setup valves and pump state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_STATE,                  ///< Pressure sensors verify pressure readings state
+    DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE,      ///< Pressure sensors verify pressure readings state
+    DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE,            ///< Pressure sensors verify pressure loss state
+    DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE,        ///< Pressure sensors verify pressure stability state
     DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE,           ///< Pressure sensors verify normal pressure readings state
     DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE,                ///< Prime syringe pump state
     DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE,  ///< Occlusion detection state
@@ -727,13 +731,50 @@
     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,
+    HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,                            ///< HD Pre-treatment dry self-test cartridge result
+    HD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT,                             ///< HD Pre-treatment dry self-test pressure result
+    HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,                         ///< HD Pre-treatment wet self-test displacement result
+    HD_EVENT_CPU_RAM_ERROR_STATUS,                                      ///< HD single-bit Ram error event
     NUM_OF_EVENT_IDS                                                    ///< Total number of HD events
 };
 typedef enum HD_Event_List HD_EVENT_ID_T;                               ///< Type for HD event list enumeration
 
 /**@}*/
 
+/**
+ *  @addtogroup UIUserConfirm
+ *  @{
+ */
+
+/// Enumeration of generic confirmation.
+enum Generic_Confirm_Command
+{
+    GENERIC_CONFIRM_CMD_REQUEST_OPEN    = 0,                            ///< Generic Confirm command to display the confirmation
+    GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE   = 1,                            ///< Generic Confirm command to hide    the confirmation, due to timeout user confirmation
+    GENERIC_CONFIRM_CMD_REJECT          = 2,                            ///< Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore.
+    GENERIC_CONFIRM_CMD_ACCEPT_CLOSE    = 3,                            ///< Generic Confirm command to hide    the confirmation, due to accept  user confirmation.
+    NUM_OF_GENERIC_CONFIRM_COMMAND         ,                            ///< Total number of generic confirm commands
+};
+typedef enum Generic_Confirm_Command GENERIC_CONFIRM_COMMAND_T;         ///< Type for generic confirm enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup UIUserConfirm
+ *  @{
+ */
+
+/// Enumeration of generic confirmation.
+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_CHEMICAL,                         ///< Chemical disinfect stop 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
+
+/**@}*/
+
 #endif