diff --git a/config/settings.properties b/config/settings.properties index 39c38ec..d452130 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,10 +1,10 @@ -#Tue Apr 05 09:11:38 CEST 2022 +#Wed Jun 01 14:32:53 CEST 2022 dry_mount_counter=0 room_temperature_enabled=false pin_offset=-0.0 puck_types=true imaging_enabled=false -dry_timestamp=1.649142698729E9 +dry_timestamp=1.653999495892E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/config/variables.properties b/config/variables.properties index 339ddb1..65cdaf1 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Wed Mar 02 10:58:36 CET 2022 -LastRunDate=220302 -FileSequentialNumber=206 +#Wed May 18 14:02:16 CEST 2022 +LastRunDate=220518 +FileSequentialNumber=208 DaySequentialNumber=2 diff --git a/devices/A1.properties b/devices/A1.properties index 5369908..f81a9d2 100644 --- a/devices/A1.properties +++ b/devices/A1.properties @@ -1,3 +1,3 @@ -#Tue May 25 11:05:57 CEST 2021 +#Wed Apr 27 10:20:34 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/A2.properties b/devices/A2.properties index e952201..176b63b 100644 --- a/devices/A2.properties +++ b/devices/A2.properties @@ -1,3 +1,3 @@ -#Wed Sep 08 08:15:44 CEST 2021 +#Wed May 18 14:00:37 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/A3.properties b/devices/A3.properties index 0ccae8b..20eaf30 100644 --- a/devices/A3.properties +++ b/devices/A3.properties @@ -1,3 +1,3 @@ -#Sat Apr 02 16:26:23 CEST 2022 +#Wed May 18 14:00:40 CEST 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/A4.properties b/devices/A4.properties index bdc0c72..d9e8940 100644 --- a/devices/A4.properties +++ b/devices/A4.properties @@ -1,3 +1,3 @@ -#Tue Nov 30 11:36:11 CET 2021 +#Tue May 03 10:48:50 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/B2.properties b/devices/B2.properties index d5a21f0..802bce1 100644 --- a/devices/B2.properties +++ b/devices/B2.properties @@ -1,3 +1,3 @@ -#Fri Apr 01 11:06:19 CEST 2022 +#Wed May 18 14:01:08 CEST 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/B3.properties b/devices/B3.properties index fcf57b6..ef42b73 100644 --- a/devices/B3.properties +++ b/devices/B3.properties @@ -1,3 +1,3 @@ -#Mon Apr 29 16:40:05 CEST 2019 +#Thu Apr 14 09:52:15 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/C1.properties b/devices/C1.properties index 66e728f..05701fc 100644 --- a/devices/C1.properties +++ b/devices/C1.properties @@ -1,3 +1,3 @@ -#Fri Apr 01 11:06:42 CEST 2022 +#Wed May 18 14:01:25 CEST 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/C5.properties b/devices/C5.properties index c3e62a7..141d891 100644 --- a/devices/C5.properties +++ b/devices/C5.properties @@ -1,3 +1,3 @@ -#Wed Mar 23 13:38:45 CET 2022 +#Thu Apr 14 09:52:29 CEST 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/E1.properties b/devices/E1.properties index dad038a..c0d0cdb 100644 --- a/devices/E1.properties +++ b/devices/E1.properties @@ -1,3 +1,3 @@ -#Wed Mar 23 13:38:50 CET 2022 +#Thu Apr 14 09:52:40 CEST 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/E5.properties b/devices/E5.properties index 4ee2c6c..65b5fed 100644 --- a/devices/E5.properties +++ b/devices/E5.properties @@ -1,3 +1,3 @@ -#Tue Nov 30 11:36:19 CET 2021 +#Tue May 03 11:47:30 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/F3.properties b/devices/F3.properties index ce76fd6..b15d1b9 100644 --- a/devices/F3.properties +++ b/devices/F3.properties @@ -1,3 +1,3 @@ -#Fri Apr 01 11:06:30 CEST 2022 +#Wed May 18 13:59:19 CEST 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 4c9f4e5..e584423 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,8 +1,8 @@ -#Fri Mar 11 13:48:49 CET 2022 +#Tue May 31 18:10:47 CEST 2022 minValue=0.0 unit=V offset=0.0 -maxValue=1.0 +maxValue=0.4 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 4c9f4e5..e584423 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,8 +1,8 @@ -#Fri Mar 11 13:48:49 CET 2022 +#Tue May 31 18:10:47 CEST 2022 minValue=0.0 unit=V offset=0.0 -maxValue=1.0 +maxValue=0.4 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 4c9f4e5..e584423 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,8 +1,8 @@ -#Fri Mar 11 13:48:49 CET 2022 +#Tue May 31 18:10:47 CEST 2022 minValue=0.0 unit=V offset=0.0 -maxValue=1.0 +maxValue=0.4 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/plugins/MXSC-1.15.0.jar b/plugins/MXSC-1.15.0.jar index 581c06a..28bfc7d 100644 Binary files a/plugins/MXSC-1.15.0.jar and b/plugins/MXSC-1.15.0.jar differ diff --git a/plugins/Zach.form b/plugins/Zach.form new file mode 100644 index 0000000..752765f --- /dev/null +++ b/plugins/Zach.form @@ -0,0 +1,43 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/Zach.java b/plugins/Zach.java new file mode 100644 index 0000000..9bb09a6 --- /dev/null +++ b/plugins/Zach.java @@ -0,0 +1,77 @@ + +import ch.psi.pshell.ui.Panel; +import ch.psi.utils.State; + +/** + * + */ +public class Zach extends Panel { + + public Zach() { + initComponents(); + } + + //Overridable callbacks + @Override + public void onInitialize(int runCount) { + + } + + @Override + public void onStateChange(State state, State former) { + + } + + @Override + public void onExecutedFile(String fileName, Object result) { + } + + @Override + protected void onTimer() { + } + + @Override + protected void onLoaded() { + + } + + @Override + protected void onUnloaded() { + + } + + //Invoked by 'update()' to update components in the event thread + @Override + protected void doUpdate() { + } + + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + jButton1 = new javax.swing.JButton(); + + jButton1.setText("jButton1"); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(76, 76, 76) + .addComponent(jButton1) + .addContainerGap(300, Short.MAX_VALUE)) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(34, 34, 34) + .addComponent(jButton1) + .addContainerGap(80, Short.MAX_VALUE)) + ); + }// //GEN-END:initComponents + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton jButton1; + // End of variables declaration//GEN-END:variables +} diff --git a/script/motion/mount.py b/script/motion/mount.py index 33e7f41..d22d5af 100644 --- a/script/motion/mount.py +++ b/script/motion/mount.py @@ -145,7 +145,7 @@ def mount(segment, puck, sample, force=True, read_dm=False, auto_unmount=False): evlog(msg) if not hasSample: - if is_aux or is_rt: + if was_warm and (is_aux or is_rt): robot.move_park() else: robot.move_cold()