tell/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-S_Changer
2019-03-18 14:27:56 +01:00
parent 41aa11866f
commit 9c75de0b13
42 changed files with 148 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.properties
+3 -2
View File
@@ -1,4 +1,4 @@
#Thu Feb 21 14:00:54 CET 2019
#Mon Mar 18 11:39:59 CET 2019
autoSaveScanData=true
commandExecutionEvents=false
createSessionFiles=true
@@ -10,6 +10,7 @@ dataScanPreserveTypes=false
dataScanReleaseRecords=false
dataServerPort=-1
depthDimension=0
hideServerMessages=true
hostName=null
instanceName=TellSwissMX
logDaysToLive=30
@@ -17,7 +18,7 @@ logLevel=Fine
logLevelConsole=Off
logPath={logs}/{date}_{time}
notificationLevel=null
saveCommandStatistics=false
saveCommandStatistics=true
scanStreamerPort=-1
serverEnabled=true
serverPort=8080
config/settings.properties
+5 -6
View File
@@ -1,13 +1,12 @@
#Thu Feb 28 15:18:27 CET 2019
#Mon Mar 18 11:42:13 CET 2019
barcode_reader_scan_pucks=true
beamline_status_enabled=false
dry_mount_counter=60
dry_timestamp=1.543854393748E9
force_dry_mount_count=0
dry_mount_counter=2
dry_timestamp=1.552645972582E9
force_dry_mount_count=10
force_dry_timeout=0
imaging_enabled=false
led_level=0.0
mounted_sample_position=R46
pin_angle_offset=0.0
pin_offset=0.0
puck_types=true
@@ -16,4 +15,4 @@ roi_w=1000
roi_x=337
roi_y=139
room_temperature_enabled=true
valve_control=true
valve_control=false
config/setup-modbus.properties
+2 -1
View File
@@ -1,7 +1,8 @@
#Wed Sep 14 15:16:45 CEST 2016
#Wed Mar 06 11:11:04 CET 2019
configFile={config}/config.properties
configFileDevices={config}/devices-modbus.properties
configFilePlugins={config}/plugins.properties
configFileSettings={config}/settings.properties
configFileTasks={config}/tasks.properties
configPath={home}/config
contextPath={outp}/context
devices/A3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:08:35 CET 2019
detection=Mechanical
disabled=false
devices/A4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:08:20 CET 2019
detection=Mechanical
disabled=false
devices/A5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:08:54 CET 2019
detection=Mechanical
disabled=false
devices/B1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:03 CET 2019
detection=Mechanical
disabled=false
devices/B2.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:06 CET 2019
detection=Mechanical
disabled=false
devices/B3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 09:22:21 CET 2019
detection=Inductive
disabled=false
devices/B4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 09:22:14 CET 2019
detection=Mechanical
disabled=false
devices/B5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:21 CET 2019
detection=Mechanical
disabled=false
devices/C1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:24 CET 2019
detection=Mechanical
disabled=false
devices/C2.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:27 CET 2019
detection=Mechanical
disabled=false
devices/C4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:35 CET 2019
detection=Mechanical
disabled=false
devices/C5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
detection=Both
#Mon Mar 11 11:09:40 CET 2019
detection=Mechanical
disabled=false
devices/D1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:32 CET 2019
detection=Both
disabled=false
disabled=true
devices/D2.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:39 CET 2019
detection=Both
disabled=false
disabled=true
devices/D3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:42 CET 2019
detection=Both
disabled=false
disabled=true
devices/D4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:44 CET 2019
detection=Both
disabled=false
disabled=true
devices/D5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:47 CET 2019
detection=Both
disabled=false
disabled=true
devices/E1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:49 CET 2019
detection=Both
disabled=false
disabled=true
devices/E2.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:51 CET 2019
detection=Both
disabled=false
disabled=true
devices/E3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:54 CET 2019
detection=Both
disabled=false
disabled=true
devices/E4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:06:57 CET 2019
detection=Both
disabled=false
disabled=true
devices/E5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:07:02 CET 2019
detection=Both
disabled=false
disabled=true
devices/F1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:07:04 CET 2019
detection=Both
disabled=false
disabled=true
devices/F2.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:07:06 CET 2019
detection=Both
disabled=false
disabled=true
devices/F3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:07:08 CET 2019
detection=Both
disabled=false
disabled=true
devices/F4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:07:10 CET 2019
detection=Both
disabled=false
disabled=true
devices/F5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Feb 14 10:34:24 CET 2019
#Mon Mar 11 11:07:12 CET 2019
detection=Both
disabled=false
disabled=true
devices/led_ctrl_1.properties
+2 -2
View File
@@ -1,5 +1,5 @@
#Mon Dec 03 22:45:14 CET 2018
maxValue=0.4
#Mon Mar 18 11:42:13 CET 2019
maxValue=1.0
minValue=0.0
offset=0.0
precision=2
devices/led_ctrl_2.properties
+2 -2
View File
@@ -1,5 +1,5 @@
#Mon Dec 03 22:45:14 CET 2018
maxValue=0.4
#Mon Mar 18 11:42:13 CET 2019
maxValue=1.0
minValue=0.0
offset=0.0
precision=2
devices/led_ctrl_3.properties
+2 -2
View File
@@ -1,5 +1,5 @@
#Mon Dec 03 22:45:14 CET 2018
maxValue=0.4
#Mon Mar 18 11:42:13 CET 2019
maxValue=1.0
minValue=0.0
offset=0.0
precision=2
devices/smart_magnet.properties
+2 -2
View File
@@ -1,6 +1,6 @@
#Fri Feb 15 12:53:07 CET 2019
#Thu Mar 14 16:45:07 CET 2019
holdingCurrent=40.0
mountCurrent=20.0
mountCurrent=40.0
remanenceCurrent=-10.0
restingCurrent=20.0
reverseCurrent=-10.0
plugins/Commands.java
+2 -2
View File
@@ -932,12 +932,12 @@ public class Commands extends Panel {
private void buttonGetAuxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGetAuxActionPerformed
int sample = (Integer) spinnerSample.getValue();
execute("get_aux('" + sample + ")");
execute("get_aux('" + sample + "')");
}//GEN-LAST:event_buttonGetAuxActionPerformed
private void buttonPutAuxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPutAuxActionPerformed
int sample = (Integer) spinnerSample.getValue();
execute("put_aux('" + sample + ")");
execute("put_aux('" + sample + "')");
}//GEN-LAST:event_buttonPutAuxActionPerformed
private void checkAuxiliaryActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkAuxiliaryActionPerformed
plugins/MXSC-1.10.0.jar
BIN
View File
Binary file not shown.
plugins/SmartMagnetPanel.form
+26 -34
View File
@@ -55,22 +55,20 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel10" alignment="1" min="-2" pref="52" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="1" min="-2" pref="52" max="-2" attributes="0"/>
<Component id="jLabel1" alignment="1" min="-2" pref="52" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="ledMounted" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel1" min="-2" pref="52" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="ledStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="panelPowerCtr" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel5" min="-2" pref="52" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="ledMounted" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel10" min="-2" pref="52" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="panelCurrentRb" min="-2" pref="173" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="panelCurrentRb" min="-2" pref="148" max="-2" attributes="0"/>
<Component id="textStatus" min="-2" pref="148" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="32767" attributes="0"/>
@@ -82,9 +80,9 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel1" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="ledStatus" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="panelPowerCtr" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel1" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textStatus" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
@@ -92,9 +90,9 @@
<Component id="ledMounted" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel10" min="-2" max="-2" attributes="0"/>
<Component id="panelCurrentRb" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel10" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="panelCurrentRb" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -115,21 +113,6 @@
<Property name="text" type="java.lang.String" value="Status:"/>
</Properties>
</Component>
<Container class="javax.swing.JPanel" name="panelPowerCtr">
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="150" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="23" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
</Container>
<Component class="javax.swing.JLabel" name="jLabel5">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -154,6 +137,15 @@
<Property name="deviceName" type="java.lang.String" value="smc_current_rb"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textStatus">
<Properties>
<Property name="horizontalAlignment" type="int" value="0"/>
<Property name="disabledTextColor" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="ch.psi.pshell.swing.DeviceStatePanel" name="panelState">
plugins/SmartMagnetPanel.java
+24 -28
View File
@@ -41,26 +41,31 @@ public class SmartMagnetPanel extends DevicePanel {
ledSupressed.setColor(Color.ORANGE);
ledStatus.setColor(Color.GREEN);
ledMounted.setColor(Color.RED);
textStatus.setText("Supressed");
break;
case Ready:
ledSupressed.setColor(Color.BLACK);
ledStatus.setColor(Color.GREEN);
ledMounted.setColor(Color.GREEN);
textStatus.setText("Not Mounted");
break;
case Busy:
ledSupressed.setColor(Color.BLACK);
ledStatus.setColor(Color.GREEN);
ledMounted.setColor(Color.ORANGE);
textStatus.setText("Mounted");
break;
case Fault:
ledSupressed.setColor(Color.RED);
ledStatus.setColor(Color.RED);
ledMounted.setColor(Color.RED);
textStatus.setText("Error");
break;
default:
ledSupressed.setColor(Color.BLACK);
ledStatus.setColor(Color.BLACK);
ledMounted.setColor(Color.BLACK);
textStatus.setText("Invalid");
break;
}
buttonSupressOn.setEnabled((state==State.Ready) || (state == State.Busy));
@@ -83,11 +88,11 @@ public class SmartMagnetPanel extends DevicePanel {
jPanel1 = new javax.swing.JPanel();
ledStatus = new ch.psi.pshell.swing.Led();
jLabel1 = new javax.swing.JLabel();
panelPowerCtr = new javax.swing.JPanel();
jLabel5 = new javax.swing.JLabel();
ledMounted = new ch.psi.pshell.swing.Led();
jLabel10 = new javax.swing.JLabel();
panelCurrentRb = new ch.psi.pshell.swing.DeviceValuePanel();
textStatus = new javax.swing.JTextField();
panelState = new ch.psi.pshell.swing.DeviceStatePanel();
panelCurrent = new ch.psi.pshell.swing.ProcessVariablePanel();
jPanel2 = new javax.swing.JPanel();
@@ -105,17 +110,6 @@ public class SmartMagnetPanel extends DevicePanel {
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("Status:");
javax.swing.GroupLayout panelPowerCtrLayout = new javax.swing.GroupLayout(panelPowerCtr);
panelPowerCtr.setLayout(panelPowerCtrLayout);
panelPowerCtrLayout.setHorizontalGroup(
panelPowerCtrLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 150, Short.MAX_VALUE)
);
panelPowerCtrLayout.setVerticalGroup(
panelPowerCtrLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 23, Short.MAX_VALUE)
);
jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel5.setText("Mounted:");
@@ -126,6 +120,10 @@ public class SmartMagnetPanel extends DevicePanel {
panelCurrentRb.setDeviceName("smc_current_rb");
textStatus.setHorizontalAlignment(javax.swing.JTextField.CENTER);
textStatus.setDisabledTextColor(new java.awt.Color(0, 0, 0));
textStatus.setEnabled(false);
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
@@ -133,20 +131,18 @@ public class SmartMagnetPanel extends DevicePanel {
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel10, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(ledMounted, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(ledStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelPowerCtr, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(ledMounted, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelCurrentRb, javax.swing.GroupLayout.PREFERRED_SIZE, 173, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGap(18, 18, 18)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelCurrentRb, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(textStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel1Layout.setVerticalGroup(
@@ -154,15 +150,15 @@ public class SmartMagnetPanel extends DevicePanel {
.addGroup(jPanel1Layout.createSequentialGroup()
.addGap(4, 4, 4)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel1)
.addComponent(ledStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(panelPowerCtr, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(jLabel1)
.addComponent(textStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel5)
.addComponent(ledMounted, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel10)
.addComponent(panelCurrentRb, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
@@ -314,7 +310,7 @@ public class SmartMagnetPanel extends DevicePanel {
private ch.psi.pshell.swing.Led ledSupressed;
private ch.psi.pshell.swing.ProcessVariablePanel panelCurrent;
private ch.psi.pshell.swing.DeviceValuePanel panelCurrentRb;
private javax.swing.JPanel panelPowerCtr;
private ch.psi.pshell.swing.DeviceStatePanel panelState;
private javax.swing.JTextField textStatus;
// End of variables declaration//GEN-END:variables
}
script/devices/RobotSC.py
+12 -12
View File
@@ -27,23 +27,23 @@ joint_forces = False
class RobotSC(RobotTCP):
def __init__(self, name, server, timeout = 1000, retries = 1):
RobotTCP.__init__(self, name, server, timeout, retries)
self.set_tasks(["getDewar", "putDewar", "putGonio", "getGonio", "recover", "moveDewar", "moveCold", "movePark", "moveGonio","moveHeater", "moveScanner","moveHome", "moveAux","moveRT"])
self.set_tasks(["getDewar", "putDewar", "putGonio", "getGonio", "recover", "mvDewar", "mvCold", "mvPark", "mvGonio","mvHeater", "mvScanner","mvHome", "mvAux","mvRT","getAux","putAux"])
self.set_known_points(["pPark", "pGonio", "pDewar", "pGonioG", "pScan", "pHeater", "pHeat", "pHeatB","pHe", "pHome", "pCold", "pAux", "pRT"])
self.setPolling(DEFAULT_ROBOT_POLLING)
#self.setSimulated()
def move_dewar(self):
self.start_task('moveDewar')
self.start_task('mvDewar')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_dewar()
def move_cold(self):
self.start_task('moveCold')
self.start_task('mvCold')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_cold()
def move_home(self):
self.start_task('moveHome')
self.start_task('mvHome')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_home()
@@ -88,13 +88,13 @@ class RobotSC(RobotTCP):
def get_aux(self, sample):
self.assert_aux()
self.start_task('getAuxiliary', sample)
self.start_task('getAux', sample)
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_aux()
def put_aux(self, sample):
self.assert_aux()
self.start_task('putAuxiliary', sample)
self.start_task('putAux', sample)
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_aux()
@@ -111,7 +111,7 @@ class RobotSC(RobotTCP):
self.assert_rt()
def move_scanner(self):
self.start_task('moveScanner')
self.start_task('mvScanner')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_scanner()
@@ -121,18 +121,18 @@ class RobotSC(RobotTCP):
# self.assert_scan_stop()
def move_gonio(self):
self.start_task('moveGonio')
self.start_task('mvGonio')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_gonio()
def move_park(self):
self.start_task('movePark')
self.start_task('mvPark')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_park()
def move_heater(self, speed=-1, to_bottom=True):
self.start_task('moveHeater', speed, to_bottom)
self.start_task('mvHeater', speed, to_bottom)
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
if to_bottom:
self.assert_heater_bottom()
@@ -146,12 +146,12 @@ class RobotSC(RobotTCP):
self.assert_home()
def move_aux(self):
self.start_task('moveAux')
self.start_task('mvAux')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_aux()
def move_rt(self):
self.start_task('moveRT')
self.start_task('mvRT')
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_rt()
script/motion/mount.py
+1
View File
@@ -54,6 +54,7 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False)
smart_magnet.set_supress(False)
time.sleep(0.2)
#To better dectect sample
smart_magnet.apply_reverse()
smart_magnet.apply_resting()
time.sleep(0.5)
if smart_magnet.check_mounted(idle_time=0.25, timeout = 1.0) == True:
script/motion/tools.py
+9 -8
View File
@@ -149,18 +149,19 @@ def assert_valid_address(segment, puck, sample):
raise Exception ("Invalid address for RT gripper")
if is_string(segment):
segment = ord(segment.upper()) - ord('A') +1
if segment<=0 or segment >6:
raise Exception ("Invalid segment")
if puck<=0 or puck >5:
raise Exception ("Invalid puck")
if sample<=0 or sample >16:
raise Exception ("Invalid sample")
if (segment<=0) or (segment >6):
raise Exception ("Invalid segment: " + str(segment))
if (puck<=0) or (puck >5):
raise Exception ("Invalid puck: " +str( puck))
if (sample<=0) or (sample >16):
raise Exception ("Invalid sample: " + str(sample))
if get_puck_dev(segment, puck).isDisabled():
raise Exception ("Puck is disabled")
def assert_valid_sample(sample):
if sample<=0 or sample >16:
raise Exception ("Invalid sample")
sample = int(sample)
if (sample<=0) or (sample >16):
raise Exception ("Invalid sample: " + str(sample))
def get_puck_name(segment, puck):
try:
script/motion/unmount.py
+2 -1
View File
@@ -41,7 +41,8 @@ def unmount(segment = None, puck = None, sample = None, force=False, auto_unmoun
if smart_magnet.get_supress() == True:
smart_magnet.set_supress(False)
time.sleep(0.2)
smart_magnet.apply_reverse()
smart_magnet.apply_resting()
if not force: