Index: dialin/common/hd_defs.py
===================================================================
diff -u -r203cccfc4ce751b7245f01f5402a54bfe83ad059 -r7c8abf7b4542dd9beb8e7b3dc38bd11996f57f24
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 203cccfc4ce751b7245f01f5402a54bfe83ad059)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 7c8abf7b4542dd9beb8e7b3dc38bd11996f57f24)
@@ -8,7 +8,7 @@
 # @file    hd_defs.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      09-Mar-2022
+# @date    (last)      19-Jul-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  04-Dec-2020
 #
@@ -125,7 +125,25 @@
     NUM_OF_NO_CART_SELF_TESTS_STATES                        =  9    # Number of no cartridge self-tests states
 
 
+# This 'PreTreatmentWetSelfTesStates' may need to remove, during merge it was comparing with the folowing 'PreTreatmentDrySelfTestStates'
 @unique
+class PreTreatmentWetSelfTesStates(DialinEnum):
+    WET_SELF_TESTS_START_STATE = 0
+    WET_SELF_TESTS_SETUP_STATE = 1
+    WET_SELF_TESTS_BUBBLES_STATE = 2
+    WET_SELF_TESTS_PRIME_CHECK_STATE = 3
+    WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE = 4
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE = 5
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE = 6
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE = 7
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE = 8
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE = 9
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE = 10
+    WET_SELF_TESTS_STOPPED_STATE = 11
+    WET_SELF_TESTS_COMPLETE_STATE = 12
+
+
+@unique
 class PreTreatmentDrySelfTestStates(DialinEnum):
     DRY_SELF_TESTS_START_STATE                              =  0    # Dry self-tests starting state
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE                =  1    # Wait for door to close before executing self-tests
@@ -435,3 +453,26 @@
     SALINE_BOLUS_STATE_IN_PROGRESS                          =  2    # A saline bolus delivery is in progress
     SALINE_BOLUS_STATE_MAX_DELIVERED                        =  3    # Maximum saline bolus volume reached - no more saline bolus deliveries allowed
     NUM_OF_SALINE_BOLUS_STATES                              =  4    # Number of saline bolus states
+
+@unique
+class TreatmentParameters(DialinEnum):
+    TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN = 0
+    TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN = 1
+    TREATMENT_PARAM_TREATMENT_DURATION_MIN = 2
+    TREATMENT_PARAM_HEPARIN_PRESTOP_MIN = 3
+    TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML = 4
+    TREATMENT_PARAM_ACID_CONCENTRATE = 5
+    TREATMENT_PARAM_BICARB_CONCENTRATE = 6
+    TREATMENT_PARAM_DIALYZER_TYPE = 7
+    TREATMENT_PARAM_HEPARIN_TYPE = 8
+    TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN = 9
+    TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN = 10
+    TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG = 11
+    TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG = 12
+    TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG = 13
+    TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG = 14
+    TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR = 15
+    TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML = 16
+    TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C = 17
+    TREATMENT_PARAM_UF_VOLUME_L = 18
+    NUM_OF_TREATMENT_PARAMS = 19