diff --git a/Gui/jsonFiles/instruments_osu_adcboardsldo.json b/Gui/jsonFiles/instruments_osu_adcboardsldo.json index df98aa70..a044aed5 100644 --- a/Gui/jsonFiles/instruments_osu_adcboardsldo.json +++ b/Gui/jsonFiles/instruments_osu_adcboardsldo.json @@ -4,8 +4,8 @@ "class": "Keithley2410", "resource": "ASRL/dev/ttyUSBkeith::INSTR", "sim": false, - "default_voltage": -80, - "default_current": 5e-6 + "default_voltage": -120, + "default_current": 10e-6 }, "lv_1": { "class": "KeysightE3633A", diff --git a/Gui/jsonFiles/instruments_osu_auto.json b/Gui/jsonFiles/instruments_osu_auto.json index 98d0f786..bcb954d4 100644 --- a/Gui/jsonFiles/instruments_osu_auto.json +++ b/Gui/jsonFiles/instruments_osu_auto.json @@ -17,7 +17,7 @@ "cb": { "class": "PSIColdbox", "resource": "TCPIP::coldbox::1883::SOCKET", - "default_temperature": -10, + "default_temperature": -20, "temperature_tolerance": 0.5, "validation_time": 20, "validation_timeout": 600 diff --git a/Gui/jsonFiles/instruments_osu_oneLV.json b/Gui/jsonFiles/instruments_osu_oneLV.json index 64689a6f..3410722d 100644 --- a/Gui/jsonFiles/instruments_osu_oneLV.json +++ b/Gui/jsonFiles/instruments_osu_oneLV.json @@ -20,5 +20,10 @@ "lv": {"instrument":"lv_1", "channel":1}, "hv": {"instrument":"hv", "channel":1} } + }, + "fc7_address_dict":{ + "fc7.board.1" : "192.168.1.80", + "fc7.board.2" : "192.168.1.81", + "fc7.board.3" : "192.168.1.82" } } diff --git a/Gui/jsonFiles/instruments_osu_twoLV.json b/Gui/jsonFiles/instruments_osu_twoLV.json index e57fbeb9..6587d3c0 100644 --- a/Gui/jsonFiles/instruments_osu_twoLV.json +++ b/Gui/jsonFiles/instruments_osu_twoLV.json @@ -31,5 +31,10 @@ "lv": {"instrument":"lv_2", "channel":1}, "hv": {"instrument":"hv", "channel":1} } + }, + "fc7_address_dict":{ + "fc7.board.1" : "192.168.1.80", + "fc7.board.2" : "192.168.1.81", + "fc7.board.3" : "192.168.1.82" } } \ No newline at end of file diff --git a/Gui/siteConfig.py b/Gui/siteConfig.py index 822053e8..66a3317f 100644 --- a/Gui/siteConfig.py +++ b/Gui/siteConfig.py @@ -2,7 +2,7 @@ import logging from MonitoringSettings import Monitor_SleepTime -CONFIG_VER = 6 +CONFIG_VER = 7 # Customize the logging configuration logging.basicConfig( diff --git a/InnerTrackerTests b/InnerTrackerTests index 5742755a..111008fa 160000 --- a/InnerTrackerTests +++ b/InnerTrackerTests @@ -1 +1 @@ -Subproject commit 5742755ac1f988d6b80a79ee6a0869d9da3fa375 +Subproject commit 111008fad110e441c895b5ae28294a962ecc90c8 diff --git a/Ph2_ACF b/Ph2_ACF index 99b06c7f..92d09f47 160000 --- a/Ph2_ACF +++ b/Ph2_ACF @@ -1 +1 @@ -Subproject commit 99b06c7f235f2568c1ecdce8c711503c4625d08c +Subproject commit 92d09f473506279852af8f38fd30f0b9fde9ff6e diff --git a/check_configuration_files.sh b/check_configuration_files.sh index b34df5a6..ce78f996 100644 --- a/check_configuration_files.sh +++ b/check_configuration_files.sh @@ -1,5 +1,5 @@ #!/bin/bash -REQUIRED_VERSION=6 # Will need to change this by hand +REQUIRED_VERSION=7 # Will need to change this by hand # Loop over all files passed as arguments for FILE in "$@"; do diff --git a/felis b/felis index 17d2d58f..117f432c 160000 --- a/felis +++ b/felis @@ -1 +1 @@ -Subproject commit 17d2d58fda2d7df607d17059fdc911f39bd42b2e +Subproject commit 117f432ca3fe2943da9ce70abd40c80a7c8ff290 diff --git a/run_Docker.sh b/run_Docker.sh index b03a5643..ef59676a 100644 --- a/run_Docker.sh +++ b/run_Docker.sh @@ -1,13 +1,13 @@ #!/bin/bash # DO NOT EDIT THIS BY HAND!!! -CONFIG_VER=6 +CONFIG_VER=7 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:v3-1-1" +IMAGE_NAME="osupixels/ph2_acf_gui_dev:v4.0.0-pre" #IMAGE_NAME="majoyce2/ph2_acf_gui_purdue:latest" #IMAGE_NAME="majoyce2/ph2_acf_gui_user:latest" #IMAGE_NAME="local/testimagemay29user"