Index: tests/unit_tests/test_ui_proxy.py
===================================================================
diff -u -r9d116c25f6482d61d324558b8a1f745468030740 -r49316680942336bcf5025be8930c6457b0146dbe
--- tests/unit_tests/test_ui_proxy.py	(.../test_ui_proxy.py)	(revision 9d116c25f6482d61d324558b8a1f745468030740)
+++ tests/unit_tests/test_ui_proxy.py	(.../test_ui_proxy.py)	(revision 49316680942336bcf5025be8930c6457b0146dbe)
@@ -1,16 +1,16 @@
 ###########################################################################
 #
-# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
 #
 # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-# @file test_imports.py
+# @file    test_ui_proxy.py
 #
-# @author (last) Peter Lucia
-# @date (last) 20-Nov-2020
-# @author (original) Peter Lucia
-# @date (original) 11-Aug-2020
+# @author  (last)      Behrouz NematiPour
+# @date    (last)      17-Mar-2022
+# @author  (original)  Peter Lucia
+# @date    (original)  16-Dec-2020
 #
 ############################################################################
 import unittest
@@ -23,7 +23,7 @@
 from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 from dialin.protocols.CAN import (DenaliMessage,
                                   DenaliChannels)
-from dialin.common import MsgIds
+from dialin.common import MsgIds, TreatmentParameters
 from dialin.utils import is_interface_up, is_interface_present
 
 
@@ -45,7 +45,7 @@
             ("acid"    , 0    ),
             ("bicarb"  , 0    ),
             ("dialyzer", 0    ),
-            ("dia_temp", 35   ),
+            ("dia_temp", 35.0 ),
             ("art_low" , -300 ),
             ("art_high", -200 ),
             ("ven_low" , -100 ),
@@ -62,23 +62,23 @@
 
         self.hd.ui.cmd_set_treatment_parameters(**self.params)
 
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value]             ,  self.params.get("bld_flow", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value]         ,  self.params.get("dia_flow", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value]             ,  self.params.get("duration", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value]        ,  self.params.get("hep_rate", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value]            ,  self.params.get("hep_bol" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value]                ,  self.params.get("hep_stop", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value]             ,  self.params.get("sal_bol" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value]                   ,  self.params.get("acid"    , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value]                 ,  self.params.get("bicarb"  , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value]                      ,  self.params.get("dialyzer", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value]            ,  self.params.get("dia_temp", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value]   ,  self.params.get("art_low" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value]  ,  self.params.get("art_high", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value]     ,  self.params.get("ven_low" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value]    ,  self.params.get("ven_high", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value]   ,  self.params.get("bp_intvl", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value]         ,  self.params.get("rb_flow" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value]             ,  self.params.get("bld_flow", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value]         ,  self.params.get("dia_flow", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value]             ,  self.params.get("duration", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value]        ,  self.params.get("hep_rate", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value]            ,  self.params.get("hep_bol" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value]                ,  self.params.get("hep_stop", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value]             ,  self.params.get("sal_bol" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value]                   ,  self.params.get("acid"    , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value]                 ,  self.params.get("bicarb"  , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value]                      ,  self.params.get("dialyzer", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value]            ,  self.params.get("dia_temp", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value]   ,  self.params.get("art_low" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value]  ,  self.params.get("art_high", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value]     ,  self.params.get("ven_low" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value]    ,  self.params.get("ven_high", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value]   ,  self.params.get("bp_intvl", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value]         ,  self.params.get("rb_flow" , None))
 
 
     def test_treatment_parameters_settings_normal(self):