Index: dialin/common/hd_defs.py
===================================================================
diff -u -r33a8e39db65f087bb9abfb1a558cd80c955166e9 -r45dfa806adcfe24e08c417dabc68d800f62c7dbe
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 33a8e39db65f087bb9abfb1a558cd80c955166e9)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 45dfa806adcfe24e08c417dabc68d800f62c7dbe)
@@ -7,8 +7,8 @@
 #
 # @file    hd_defs.py
 #
-# @author  (last)      Quang Nguyen
-# @date    (last)      22-Jul-2021
+# @author  (last)      Dara Navaei
+# @date    (last)      12-Nov-2021
 # @author  (original)  Peter Lucia
 # @date    (original)  04-Dec-2020
 #
@@ -42,6 +42,31 @@
 
 
 @unique
+class HDInitStates(DialinEnum):
+    POST_STATE_START = 0
+    POST_STATE_FW_INTEGRITY = 1
+    POST_STATE_AC = 2
+    POST_STATE_WATCHDOG = 3
+    POST_STATE_SAFETY_SHUTDOWN = 4
+    POST_STATE_RTC = 5
+    POST_STATE_NVDATAMGMT = 6
+    POST_STATE_BLOOD_FLOW = 7
+    POST_STATE_DIALYSATE_FLOW = 8
+    POST_STATE_VALVES = 9
+    POST_STATE_SYRINGE_PUMP = 10
+    POST_STATE_ALARM_AUDIO = 11
+    POST_STATE_ALARM_LAMP = 12
+    POST_STATE_ACCELEROMETER = 13
+    POST_STATE_STUCK_BUTTON = 14
+    POST_STATE_UI_POST = 15
+    POST_STATE_FW_COMPATIBILITY = 16
+    POST_STATE_FPGA = 17
+    POST_STATE_COMPLETED = 18
+    POST_STATE_FAILED = 19
+    NUM_OF_POST_STATES = 20
+
+
+@unique
 class PreTreatmentSubModes(DialinEnum):
     HD_PRE_TREATMENT_START_STATE = 0
     HD_PRE_TREATMENT_WATER_SAMPLE_STATE = 1
@@ -161,9 +186,10 @@
 
 @unique
 class PostTreatmentStates(DialinEnum):
-    HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 0
-    HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 1
-    HD_POST_TREATMENT_VERIFY_STATE = 2
+    HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0
+    HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 1
+    HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE = 2
+    HD_POST_TREATMENT_VERIFY_STATE = 3
 
 
 @unique
@@ -266,6 +292,14 @@
 
 
 @unique
+class TreatmentParametersStates(DialinEnum):
+    HD_TREATMENT_PARAMS_MODE_STATE_START = 0
+    HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND = 1
+    HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM = 2
+    NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES = 3
+
+
+@unique
 class StandbyStates(DialinEnum):
     STANDBY_START_STATE = 0                             # Start standby
     STANDBY_WAIT_FOR_TREATMENT_STATE = 1                # Wait for treatment
@@ -334,6 +368,24 @@
 
 
 @unique
-class HDFaultState(DialinEnum):
+class HDFaultStates(DialinEnum):
     HD_FAULT_STATE_START = 0
     NUM_OF_HD_FAULT_STATES = 1
+
+
+@unique
+class HDEventList(DialinEnum):
+    HD_EVENT_STARTUP = 0
+    HD_EVENT_OP_MODE_CHANGE = 1
+    HD_EVENT_SUB_MODE_CHANGE = 2
+    NUM_OF_HD_EVENT_IDS = 3
+
+
+@unique
+class HDEventDataType(DialinEnum):
+    EVENT_DATA_TYPE_NONE = 0
+    EVENT_DATA_TYPE_U32 = 1
+    EVENT_DATA_TYPE_S32 = 2
+    EVENT_DATA_TYPE_F32 = 3
+    EVENT_DATA_TYPE_BOOL = 4
+    NUM_OF_EVENT_DATA_TYPES = 5
Index: dialin/dg/events.py
===================================================================
diff -u -r195b5d1aaf9e5a9e104d40947093d8af4e3860f7 -r45dfa806adcfe24e08c417dabc68d800f62c7dbe
--- dialin/dg/events.py	(.../events.py)	(revision 195b5d1aaf9e5a9e104d40947093d8af4e3860f7)
+++ dialin/dg/events.py	(.../events.py)	(revision 45dfa806adcfe24e08c417dabc68d800f62c7dbe)
@@ -8,7 +8,7 @@
 # @file    events.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      01-Nov-2021
+# @date    (last)      12-Nov-2021
 # @author  (original)  Dara Navaei
 # @date    (original)  12-Oct-2021
 #
@@ -155,8 +155,6 @@
         # Convert the event ID to enum
         event_state_name = DGEventList(event_id).name
 
-        #print(event_state_name, event_data_1, event_data_2)
-
         # Check if the event state name is operation mode change. If it is, get the name of the operation modes
         # from the op modes enum class
         if event_state_name == DGEventList.DG_EVENT_OP_MODE_CHANGE.name: