pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sfop
2016-09-01 10:14:42 +02:00
parent 45e6be8f68
commit bfdafa1135
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+1 -1
View File
@@ -22,4 +22,4 @@ gsx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:X_SP SINEG01-MSOL130:X|||true
gsy=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:Y_SP SINEG01-MSOL130:Y|||true
gsrx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_X_SP SINEG01-MSOL130:ROT_X|||true
gsry=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_Y_SP SINEG01-MSOL130:ROT_Y|||true
camtool=Camtool|SINEG01-DSCR190||-500|
#camtool=Camtool|SINEG01-DSCR190||-500|
plugins/Cameras.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class Cameras extends Panel {
//SwingUtils.showMessage(null, "", json);
try {
if (checkCamtool.isSelected()) {
camera = new Camtool("CurrentCamera", cameraName, true, true);
camera = new Camtool("CurrentCamera", cameraName, false, true);
} else {
camera = new PsiCamera("CurrentCamera", cameraName);
config = (CameraConfig) JsonSerializer.decode(cameraConfigJson, CameraConfig.class);