Index: shared/scripts/configuration/config.py =================================================================== diff -u -r575215296a0233033f2b9a3f684230e1651078bd -r3a76055c3243ac7b2820fa12b6da09e89d8f0eb4 --- shared/scripts/configuration/config.py (.../config.py) (revision 575215296a0233033f2b9a3f684230e1651078bd) +++ shared/scripts/configuration/config.py (.../config.py) (revision 3a76055c3243ac7b2820fa12b6da09e89d8f0eb4) @@ -27,18 +27,18 @@ COMMON_PATH = os.environ['HOME']+"/Projects" -#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/" -TREATMENT_LOG_LOCATION = '/home/denali/Desktop/sd-card/treatment/*.log' - #Service password loction SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Service.conf']) #Post Treatment log file location POST_TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/treatment/*.log']) +#instructions_imagelocation +INSTRUCTION_CONF_LOCATION = "".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Instructions/Instructions.conf']) +IMAGE_LOCATION = "file://"+"".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Instructions/']) +EXPECTED_IMAGE_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Instructions/']) +TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/treatment/*.log']) + #standby mode GOODMORNING_START_TIME_SEC = 0 GOODEVENING_START_TIME_SEC = 43200 @@ -71,7 +71,6 @@ BICARBONATE_CONCENTRATE = "Fres. Centrisol" DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe"] - TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" TREATMENT_HIGHLIGHTED_COLOR = "#135088"