From e59582ad02d5ebdae2fa4442c2c0df4bd2c7b7e6 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Wed, 26 Sep 2018 16:49:28 +0200 Subject: [PATCH] --- devices/led_ctrl_1.properties | 2 +- devices/led_ctrl_2.properties | 2 +- devices/led_ctrl_3.properties | 2 +- plugins/MXSC-1.10.0.jar | Bin 261173 -> 262082 bytes plugins/PuckDetectionPanel.form | 4 ++-- plugins/PuckDetectionPanel.java | 7 ++++--- script/devices/RobotSC.py | 6 ++++-- script/local.py | 19 +++++++++++++++++++ script/test/SampleDataInput_Dominik.py | 8 ++++---- 9 files changed, 36 insertions(+), 14 deletions(-) diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 032cfaa..5927139 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,4 +1,4 @@ -#Thu Sep 20 09:25:00 CEST 2018 +#Mon Sep 24 16:01:28 CEST 2018 maxValue=1.0 minValue=0.0 offset=0.0 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 032cfaa..5927139 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,4 +1,4 @@ -#Thu Sep 20 09:25:00 CEST 2018 +#Mon Sep 24 16:01:28 CEST 2018 maxValue=1.0 minValue=0.0 offset=0.0 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 032cfaa..5927139 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,4 +1,4 @@ -#Thu Sep 20 09:25:00 CEST 2018 +#Mon Sep 24 16:01:28 CEST 2018 maxValue=1.0 minValue=0.0 offset=0.0 diff --git a/plugins/MXSC-1.10.0.jar b/plugins/MXSC-1.10.0.jar index ff1ffba02b0ec4207db8120308c9f8eafb1e0a6d..d19a2d94bc1ed8265001cb72505cffa28b089cc4 100644 GIT binary patch delta 5081 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 diff --git a/plugins/PuckDetectionPanel.form b/plugins/PuckDetectionPanel.form index ddf0eb7..9d644a4 100644 --- a/plugins/PuckDetectionPanel.form +++ b/plugins/PuckDetectionPanel.form @@ -141,8 +141,8 @@ - - + +
diff --git a/plugins/PuckDetectionPanel.java b/plugins/PuckDetectionPanel.java index fe33ec5..e36c4db 100644 --- a/plugins/PuckDetectionPanel.java +++ b/plugins/PuckDetectionPanel.java @@ -1,6 +1,7 @@ import ch.psi.mxsc.Puck; import ch.psi.mxsc.PuckDetection; import ch.psi.mxsc.PuckState; +import ch.psi.mxsc.PuckState.SwitchState; import ch.psi.pshell.core.Context; import ch.psi.pshell.swing.DevicePanel; import ch.psi.utils.swing.SwingUtils; @@ -36,8 +37,8 @@ public class PuckDetectionPanel extends DevicePanel { int id = puck.getIndex() + 1; PuckState state = getDevice().getPuckState(id); table.getModel().setValueAt(state.online, row, 1); - table.getModel().setValueAt(state.mecSwitch, row, 2); - table.getModel().setValueAt(state.indSwitch, row, 3); + table.getModel().setValueAt((SwitchState.Off == state.mecSwitch) ? "" : String.valueOf(state.mecSwitch), row, 2); + table.getModel().setValueAt((SwitchState.Off == state.indSwitch) ? "" : String.valueOf(state.indSwitch), row, 3); table.getModel().setValueAt(puck.getDetection() == null ? "" : puck.getDetection(), row, 4); table.getModel().setValueAt(puck.getPuckType() == null ? "" : puck.getPuckType(), row, 5); } catch (Exception ex) { @@ -169,7 +170,7 @@ public class PuckDetectionPanel extends DevicePanel { } ) { Class[] types = new Class [] { - java.lang.String.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.String.class, java.lang.String.class + java.lang.String.class, java.lang.Boolean.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class }; boolean[] canEdit = new boolean [] { false, false, false, false, false, false diff --git a/script/devices/RobotSC.py b/script/devices/RobotSC.py index fb61510..020cd02 100644 --- a/script/devices/RobotSC.py +++ b/script/devices/RobotSC.py @@ -55,12 +55,14 @@ class RobotSC(RobotTCP): self.assert_dewar() def put_gonio(self): - self.start_task('putGonio') + pin_offset = get_pin_offset() + self.start_task('putGonio', pin_offset) self.wait_task_finished(TASK_WAIT_ROBOT_POLLING) self.assert_gonio() def get_gonio(self): - self.start_task('getGonio') + pin_offset = get_pin_offset() + self.start_task('getGonio', pin_offset) self.wait_task_finished(TASK_WAIT_ROBOT_POLLING) self.assert_gonio() diff --git a/script/local.py b/script/local.py index 1d173b2..539ae24 100644 --- a/script/local.py +++ b/script/local.py @@ -238,6 +238,25 @@ def is_puck_loading(): feedback_psys_safety.take() == False and \ not guiding_tool_park.read() +def set_pin_offset(val): + if abs(val) >5: + raise Exception("Invlid pin offset: " + str(val)) + try: + set_setting("pin_offset",float(val)) + except: + log("Error setting pin offset: " + str(sys.exc_info()[1]), False) + +def get_pin_offset(): + try: + ret = float(get_setting("pin_offset")) + if abs(ret) >5: + raise Exception("Invlid configured pin offset: " + str(ret)) + return ret + except: + log("Error getting pin offset: " + str(sys.exc_info()[1]), False) + return 0.0 + + update() add_device(Controller.getInstance().basePlate, True) diff --git a/script/test/SampleDataInput_Dominik.py b/script/test/SampleDataInput_Dominik.py index c97507c..8ff4ae7 100644 --- a/script/test/SampleDataInput_Dominik.py +++ b/script/test/SampleDataInput_Dominik.py @@ -6,7 +6,7 @@ test_sample_data = [ \ { "userName": USER_NAME, \ "dewarName": DEWAR_NAME, \ "puckName": "Isabelle Chip", \ - "puckBarcode": "PuckWithChips", \ + "puckBarcode": "CA00CF1471", \ "puckType": "unipuck", \ "puckAddress": "",\ "sampleName": "flat_Base_Pin_1", \ @@ -18,7 +18,7 @@ test_sample_data = [ \ { "userName": USER_NAME, \ "dewarName": DEWAR_NAME, \ "puckName": "Isabelle Chip", \ - "puckBarcode": "PuckWithChips", \ + "puckBarcode": "CA00CF1471", \ "puckType": "unipuck", \ "puckAddress": "",\ "sampleName": "flat_Base_Pin_2", \ @@ -30,7 +30,7 @@ test_sample_data = [ \ { "userName": USER_NAME, \ "dewarName": DEWAR_NAME, \ "puckName": "Isabelle Chip", \ - "puckBarcode": "PuckWithChips", \ + "puckBarcode": "CA00CF1471", \ "puckType": "unipuck", \ "puckAddress": "",\ "sampleName": "regular_Base_Pin_1", \ @@ -42,7 +42,7 @@ test_sample_data = [ \ { "userName": USER_NAME, \ "dewarName": DEWAR_NAME, \ "puckName": "Isabelle Chip", \ - "puckBarcode": "PuckWithChips", \ + "puckBarcode": "CA00CF1471", \ "puckType": "unipuck", \ "puckAddress": "",\ "sampleName": "regular_Base_Pin_2", \