Index: shared/scripts/configuration/config.py
===================================================================
diff -u -r854dd010b942b6f214379923f140b93cde3998c9 -r62ee1e1804a02e62964febd3618a660d080bb437
--- shared/scripts/configuration/config.py	(.../config.py)	(revision 854dd010b942b6f214379923f140b93cde3998c9)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision 62ee1e1804a02e62964febd3618a660d080bb437)
@@ -36,20 +36,21 @@
 POSITIVE_BUFFER = 10
 NEGATIVE_BUFFER = -10
 
-ACCEPTED = True
-REJECTED = False
-NUM_OF_REQUEST_REJECT_REASONS = 43
-
+#tst_pretreatment_screens color palettes
 CURRENT_COLOR = '#000000'                            
 COMPLETE_COLOR=  '#4290ec'
 ENABLED_COLOR = '#fcfcfc'                           
-INCOMPLETE_COLOR =  '#607a91' 
-OUT_OF_RANGE_COLOR = "#c53b33"
+INCOMPLETE_COLOR =  '#607a91'
 
+COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", 
+               "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da","Lime": "#b7fc36", 
+               "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", 
+               "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"}
+
+
 #standby mode
 GOODMORNING_START_TIME_SEC = 0
 GOODEVENING_START_TIME_SEC = 43200
-SALINE_BOLUS_CUMULATIVE = 300
 
 #patient id
 PATIENT_ID = {
@@ -117,60 +118,10 @@
     "rinseback_flow_rate" : [50, 25, 187],
 }
 
-#ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed,
-# MC speed, MC current and PWM.
-TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS = {
-    0 : [100, 1, 1, 1, 1, 1, 1],
-    1 : [550, 24, 32, 425, 85, 18, 36],
-    2 : [80, 125, 187, 257, 530, 458, 985],
-    3 : [100, 0, 0, 0, 0, 0, 0],
-    4 : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45],
-    }
 
-#dictionary contains uf maximum and minimum value's to set.
-TREATMENT_ULTRAFILTRATION_TESTING_OPTION = {
-    0 : {"uf_maximum" : 600, "uf_minimum" : 0},
-    1 : {"uf_maximum" : 500, "uf_minimum" : 0},
-    2 : {"uf_maximum" : 550, "uf_minimum" : 0},
-    3 : {"uf_maximum" : 300, "uf_minimum" : 0},
-    4 : {"uf_maximum" : 280, "uf_minimum" : 0},
-    5 : {"uf_maximum" : 765, "uf_minimum" : 500},
-    6 : {"uf_maximum" : 680, "uf_minimum" : 450},
-    7 : {"uf_maximum" : 480, "uf_minimum" : 380},
-    8 : {"uf_maximum" : 390, "uf_minimum" : 675},
-    9 : {"uf_maximum" : 290, "uf_minimum" : 125},
-    }
-
 #tst_pretreatment_screens
 NUM_OF_PRETREATMENT_BULLETS = len(PRE_TREATMENT_SCREENS)
 
-
-#dictionary contains saline cumulative and saline delivered value
-#key : saline cumulative value.
-#value: saline delivered value
-SALINE_BOLUS_VALUES = {
-            0          : 0, 
-            1.0        : 1.0, 
-            125.56     : 100.56, 
-            165.87     : 145.87,
-            220.65     : 220.65,
-            325.25     : 300.25,
-            400.86     : 380.86, 
-            500.00     : 500.25,
-            634.76     : 634.76,
-            823.65     : 800.65,
-            999.99     : 999.99,
-            1000       : 1000
-}
-
-
-#tst_pretreatment_screens color palettes
-CURRENT_COLOR = '#000000'                            
-COMPLETE_COLOR=  '#4290ec'
-ENABLED_COLOR = '#fcfcfc'                           
-INCOMPLETE_COLOR =  '#607a91' 
-
-
 #pre-treatment_priming
 NOT_VISIBLE = False
 VISIBLE = True
@@ -183,20 +134,9 @@
 MINIMUM_COUNTDOWN_TIME = 0
 ENABLED = True
 DISABLED = False
-CONSUMABLE_SELF_TEST_BICARB_PUMP_CHECK_STATE = 3   
+CONSUMABLE_SELF_TEST_BICARB_PUMP_CHECK_STATE = 3
+ACCEPTED = True
+REJECTED = False
 
+  
 
-TREATMENT_ULTRAFILTERATION_TESTING_OPTION = {
-    "OPTION_1" : {"uf_maximum" : 800, "uf_minimum" : 0},
-    "OPTION_2" : {"uf_maximum" : 500, "uf_minimum" : 0},
-    "OPTION_3" : {"uf_maximum" : 550, "uf_minimum" : 0},
-    "OPTION_4" : {"uf_maximum" : 300, "uf_minimum" : 0},
-    "OPTION_5" : {"uf_maximum" : 280, "uf_minimum" : 0},
-    "OPTION_6" : {"uf_maximum" : 765, "uf_minimum" : 0},
-    "OPTION_7" : {"uf_maximum" : 680, "uf_minimum" : 0},
-    "OPTION_8" : {"uf_maximum" : 1500, "uf_minimum" : 0},
-    "OPTION_9" : {"uf_maximum" : 390, "uf_minimum" : 0},
-    "OPTION_10" : {"uf_maximum" : 800, "uf_minimum" : 0},
-    "OPTION_11" : {"uf_maximum" : 1000, "uf_minimum" : 0},
-    "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0},
-    }