Index: shared/scripts/configuration/config.py =================================================================== diff -u -r3698b5cf83c5944115b66480f071aeb0d26d0165 -r2feff1e3533a6bc33fe56a3f70e08ee460822a63 --- shared/scripts/configuration/config.py (.../config.py) (revision 3698b5cf83c5944115b66480f071aeb0d26d0165) +++ shared/scripts/configuration/config.py (.../config.py) (revision 2feff1e3533a6bc33fe56a3f70e08ee460822a63) @@ -13,30 +13,37 @@ # ############################################################################ import os +from pathlib import Path from configuration.strings import * AUT_NAME = "denaliSquish" - TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" TREATMENT_HIGHLIGHTED_COLOR = "#135088" COMMON_PATH = os.environ['HOME']+"/Projects" +CONFIG_PATH = Path(os.getcwd()) +HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent #instructions_imagelocation INSTRUCTION_CONF_LOCATION = "/home/denali/Projects/application/resources/settings/Instructions/Instructions.conf" IMAGE_LOCATION = "file:///home/denali/Projects/application/resources/settings/Instructions/" EXPECTED_IMAGE_LOCATION = "/home/denali/Projects/application/resources/settings/Instructions/" -SERVICE_CONF_LOCATION = os.environ['HOME']+"/Projects/application/resources/settings/Service.conf" TREATMENT_LOG_LOCATION = '/home/denali/Desktop/sd-card/treatment/*.log' -SERVICE_CONF_LOCATION = os.environ['HOME']+"/Projects/application/resources/settings/Service.conf" +#Service password loction +SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Service.conf']) #standby mode GOODMORNING_START_TIME_SEC = 0 GOODEVENING_START_TIME_SEC = 43200 NUM_OF_REQUEST_REJECT_REASONS = 46 #Number of settings change reject codes +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"} + CURRENT_COLOR = '#000000' COMPLETE_COLOR = '#4290ec' ENABLED_COLOR = '#fcfcfc' @@ -248,18 +255,6 @@ "rinseback_flow_rate" : [50, 25, 187], } -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"} - -#Service password loction -SERVICE_CONF_LOCATION = os.environ['HOME']+"/Projects/application/resources/settings/Service.conf" - -#standby mode -GOODMORNING_START_TIME_SEC = 0 -GOODEVENING_START_TIME_SEC = 43200 - #ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, # MC speed, MC current and PWM. TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS = { @@ -375,9 +370,22 @@ MINIMUM_COUNTDOWN_TIME = 0 CONSUMABLE_SELF_TEST_BICARB_PUMP_CHECK_STATE = 3 -VALID = True -INVALID = False +#settings information +BRIGHTNESS_MIN_VAL = 20 +BRIGHTNESS_MAX_VAL = 100 +VOLUME_MIN_VAL = 20 +VOLUME_MAX_VAL = 100 +DEVICE_SETTINGS_TEXT = "Device Settings" +SERVICE_TEXT = "Service" +PASSWORD = 123 +CONFIRM_TEXT = "CONFIRM" +SERVICE_BACK_BTN = "BACK" +IP_ADDRESS = "192.168.1.1" +GATEWAY = "255.255.255.0" +SUBNET_MASK = "255.255.255.0" +DNS = "0.0.0.0" + #dictionary consist of review parameters values of post treatment POST_TREATMENT_REVIEW_PARAMETER_RANGE = { "Patient ID": ["abcd", "xyz"],