Skip to content

preparing config files for v4.0.0 tag #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlj5j merged 1 commit into from
Nov 20, 2025
Merged

preparing config files for v4.0.0 tag #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gui/jsonFiles/instruments_osu_adcboardsldo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Gui/jsonFiles/instruments_osu_auto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Gui/jsonFiles/instruments_osu_oneLV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
5 changes: 5 additions & 0 deletions Gui/jsonFiles/instruments_osu_twoLV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion Gui/siteConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
from MonitoringSettings import Monitor_SleepTime

CONFIG_VER = 6
CONFIG_VER = 7

# Customize the logging configuration
logging.basicConfig(
Expand Down
2 changes: 1 addition & 1 deletion InnerTrackerTests
Open in desktop
Submodule InnerTrackerTests updated from 574275 to 111008
2 changes: 1 addition & 1 deletion Ph2_ACF
Open in desktop
Submodule Ph2_ACF updated from 99b06c to 92d09f
2 changes: 1 addition & 1 deletion check_configuration_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion felis
Open in desktop
Submodule felis updated from 17d2d5 to 117f43
4 changes: 2 additions & 2 deletions run_Docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading