diff --git a/Gui/siteConfig.py b/Gui/siteConfig.py index 66a3317f..bcbdf72c 100644 --- a/Gui/siteConfig.py +++ b/Gui/siteConfig.py @@ -2,7 +2,7 @@ import logging from MonitoringSettings import Monitor_SleepTime -CONFIG_VER = 7 +CONFIG_VER = 8 # Customize the logging configuration logging.basicConfig( @@ -64,10 +64,13 @@ # Load instrument setup from json file # If the json filename contains 'auto', channels will be automatically assigned as listed in Working Channels - -json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json' -with open(json_setup, 'r') as file: - icicle_instrument_setup = json.load(file) +try: + json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json' + with open(json_setup, 'r') as file: + icicle_instrument_setup = json.load(file) +except FileNotFoundError: + print("Error: 'data.json' not found.") + exit() #Set peak voltage for bias scan. Make sure this value is negative or it could damage the sensor. IVcurve_range = { @@ -122,14 +125,6 @@ ## Update this dictionary for the IP addreses of your FC7 devices ## - -try: - json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json' - with open(json_setup, 'r') as file: - icicle_instrument_setup = json.load(file) -except FileNotFoundError: - print("Error: 'data.json' not found.") - exit() FC7List = icicle_instrument_setup['fc7_address_dict'] icicle_instrument_setup.pop('fc7_address_dict') diff --git a/check_configuration_files.sh b/check_configuration_files.sh index ce78f996..933e6256 100644 --- a/check_configuration_files.sh +++ b/check_configuration_files.sh @@ -1,5 +1,5 @@ #!/bin/bash -REQUIRED_VERSION=7 # Will need to change this by hand +REQUIRED_VERSION=8 # Will need to change this by hand # Loop over all files passed as arguments for FILE in "$@"; do diff --git a/run_Docker.sh b/run_Docker.sh index ef59676a..f942f5e2 100644 --- a/run_Docker.sh +++ b/run_Docker.sh @@ -1,13 +1,13 @@ #!/bin/bash # DO NOT EDIT THIS BY HAND!!! -CONFIG_VER=7 +CONFIG_VER=8 bash check_configuration_files.sh run_Docker.sh Gui/siteConfig.py SOCK=/tmp/.X11-unix; XAUTH=/tmp/.docker.xauth; xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -; chmod 777 $XAUTH; ######### Specify the docker image to use ################# -IMAGE_NAME="osupixels/ph2_acf_gui_dev:v4.0.0-pre" +IMAGE_NAME="osupixels/ph2_acf_gui_dev:v4.0.0-pre.1" #IMAGE_NAME="majoyce2/ph2_acf_gui_purdue:latest" #IMAGE_NAME="majoyce2/ph2_acf_gui_user:latest" #IMAGE_NAME="local/testimagemay29user"