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

Startup

Browse Source
This commit is contained in:
sfop
2017-05-04 14:49:09 +02:00
parent ede2d9fe03
commit 7eb3751962
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/ScreenPanel.java
View File

@@ -895,7 +895,11 @@ public class ScreenPanel extends Panel {
//Parallelizing initialization
devicesInitTask = new Thread(() -> {
try {
screen = new DiscretePositioner("CurrentScreen", cameraName + ":SET_SCREEN1_POS", cameraName + ":GET_SCREEN1_POS");
if (cameraName.contains("DSRM")){
screen = new DiscretePositioner("CurrentScreen", cameraName + ":POSITION_SP", cameraName + ":POSITION");
} else {
screen = new DiscretePositioner("CurrentScreen", cameraName + ":SET_SCREEN1_POS", cameraName + ":GET_SCREEN1_POS");
}
screen.setMonitored(true);
screen.initialize();
DefaultComboBoxModel model = new DefaultComboBoxModel();
@@ -2774,7 +2778,11 @@ public class ScreenPanel extends Panel {
ChannelInteger setpoint = null;
try {
int index = comboScreen.getSelectedIndex();
setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS");
if (cameraName.contains("DSRM")){
setpoint = new ChannelInteger(null, cameraName + ":POSITION_SP");
} else {
setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS");
}
setpoint.initialize();
if (setpoint.read() != index) {
setpoint.write(index);