From 67dd3f6f40c44c44c01437a8afe7088fc9b6c78a Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 7 Jun 2022 11:08:06 +0200 Subject: [PATCH] fix mount.py park or cold after failure --- config/settings.properties | 4 +- config/variables.properties | 6 +-- devices/A1.properties | 2 +- devices/A2.properties | 2 +- devices/A3.properties | 4 +- devices/A4.properties | 2 +- devices/B2.properties | 4 +- devices/B3.properties | 2 +- devices/C1.properties | 4 +- devices/C5.properties | 4 +- devices/E1.properties | 4 +- devices/E5.properties | 2 +- devices/F3.properties | 4 +- devices/led_ctrl_1.properties | 4 +- devices/led_ctrl_2.properties | 4 +- devices/led_ctrl_3.properties | 4 +- plugins/MXSC-1.15.0.jar | Bin 287436 -> 288467 bytes plugins/Zach.form | 43 +++++++++++++++++++ plugins/Zach.java | 77 ++++++++++++++++++++++++++++++++++ script/motion/mount.py | 2 +- 20 files changed, 149 insertions(+), 29 deletions(-) create mode 100644 plugins/Zach.form create mode 100644 plugins/Zach.java 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 581c06a456cfae3ef3e3a4fc1d72e6fd3768fc1a..28bfc7d1abf51a2dda4e7ca0ea00cb28c84b960a 100644 GIT binary patch delta 15934 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Ÿ)lI*$ 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 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()