diff --git a/config/config.properties b/config/config.properties old mode 100644 new mode 100755 index 4cb47ce..bdd54cd --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Tue Jan 31 08:37:20 CET 2023 +#Wed Feb 01 14:17:52 CET 2023 autoSaveScanData=true simulation=false dataScanSaveOutput=false @@ -30,7 +30,7 @@ versionTrackingRemote=git@git.psi.ch\:pshell_config/bernina_robot.git dataScanLazyTableCreation=false logDaysToLive=-1 logLevelConsole=Off -filePermissionsConfig=Default +filePermissionsConfig=Public scanStreamerPort=-1 dataScanSaveSetpoints=false versionTrackingManual=true @@ -42,9 +42,9 @@ hideServerMessages=false dataScanReleaseRecords=false dataScanPreserveTypes=false dataScanFlushRecords=false -filePermissionsLogs=Default +filePermissionsLogs=Public logPath={logs}/{date}_{time} -filePermissionsScripts=Default +filePermissionsScripts=Public filePermissionsData=Default dataProvider=h5 saveCommandStatistics=false diff --git a/config/devices.properties b/config/devices.properties old mode 100644 new mode 100755 diff --git a/config/mail.properties b/config/mail.properties old mode 100644 new mode 100755 diff --git a/config/plugins.properties b/config/plugins.properties old mode 100644 new mode 100755 diff --git a/config/preferences.json b/config/preferences.json old mode 100644 new mode 100755 diff --git a/config/setup.properties b/config/setup.properties old mode 100644 new mode 100755 diff --git a/devices/cam_n.properties b/devices/cam_n.properties old mode 100644 new mode 100755 diff --git a/devices/cam_s.properties b/devices/cam_s.properties old mode 100644 new mode 100755 diff --git a/devices/cam_w.properties b/devices/cam_w.properties old mode 100644 new mode 100755 diff --git a/plugins/.DS_Store b/plugins/.DS_Store old mode 100644 new mode 100755 diff --git a/plugins/RobotBernina.form b/plugins/RobotBernina.form old mode 100644 new mode 100755 index 8bacaa1..ebe571d --- a/plugins/RobotBernina.form +++ b/plugins/RobotBernina.form @@ -61,6 +61,11 @@ + + + + + @@ -78,6 +83,11 @@ + + + + + @@ -115,6 +125,21 @@ + + + + + + + + + + + + + + + @@ -746,7 +771,7 @@ - + diff --git a/plugins/RobotBernina.java b/plugins/RobotBernina.java old mode 100644 new mode 100755 index 68888f4..3661eca --- a/plugins/RobotBernina.java +++ b/plugins/RobotBernina.java @@ -299,6 +299,8 @@ public class RobotBernina extends Panel { moveHome = new javax.swing.JButton(); buttonTweakX = new javax.swing.JButton(); spinnerOffsetX = new javax.swing.JSpinner(); + buttonTweakX1 = new javax.swing.JButton(); + spinnerOffsetY = new javax.swing.JSpinner(); panelRobot = new javax.swing.JPanel(); deviceStatePanel1 = new ch.psi.pshell.swing.DeviceStatePanel(); jPanel4 = new javax.swing.JPanel(); @@ -382,6 +384,15 @@ public class RobotBernina extends Panel { spinnerOffsetX.setModel(new javax.swing.SpinnerNumberModel(1.0d, -10.0d, 10.0d, 1.0d)); + buttonTweakX1.setText("Tweak Y"); + buttonTweakX1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + buttonTweakX1ActionPerformed(evt); + } + }); + + spinnerOffsetY.setModel(new javax.swing.SpinnerNumberModel(1.0d, -10.0d, 10.0d, 1.0d)); + javax.swing.GroupLayout panelCommandsLayout = new javax.swing.GroupLayout(panelCommands); panelCommands.setLayout(panelCommandsLayout); panelCommandsLayout.setHorizontalGroup( @@ -394,7 +405,11 @@ public class RobotBernina extends Panel { .addGroup(panelCommandsLayout.createSequentialGroup() .addComponent(buttonTweakX, javax.swing.GroupLayout.PREFERRED_SIZE, 138, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(spinnerOffsetX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(spinnerOffsetX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(panelCommandsLayout.createSequentialGroup() + .addComponent(buttonTweakX1, javax.swing.GroupLayout.PREFERRED_SIZE, 138, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(spinnerOffsetY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelCommandsLayout.setVerticalGroup( @@ -408,6 +423,10 @@ public class RobotBernina extends Panel { .addGroup(panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(buttonTweakX) .addComponent(spinnerOffsetX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(buttonTweakX1) + .addComponent(spinnerOffsetY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -993,7 +1012,7 @@ public class RobotBernina extends Panel { .addComponent(jPanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(200, Short.MAX_VALUE)) + .addContainerGap(229, Short.MAX_VALUE)) ); panelCameras.add(panelControls, java.awt.BorderLayout.WEST); @@ -1129,6 +1148,10 @@ public class RobotBernina extends Panel { evalCmd("robot.tweak_x(" + spinnerOffsetX.getValue() + ")"); }//GEN-LAST:event_buttonTweakXActionPerformed + private void buttonTweakX1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonTweakX1ActionPerformed + evalCmd("robot.tweak_y(" + spinnerOffsetY.getValue() + ")"); + }//GEN-LAST:event_buttonTweakX1ActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton butonStop; private javax.swing.JButton buttonAbort; @@ -1148,6 +1171,7 @@ public class RobotBernina extends Panel { private javax.swing.JButton buttonPause; private javax.swing.JButton buttonResume; private javax.swing.JButton buttonTweakX; + private javax.swing.JButton buttonTweakX1; private javax.swing.JButton buttonZooHome; private javax.swing.JButton buttonZoomIn; private javax.swing.JButton buttonZoomOut; @@ -1188,6 +1212,7 @@ public class RobotBernina extends Panel { private javax.swing.JPanel panelRobot; private ch.psi.pshell.imaging.Renderer renderer; private javax.swing.JSpinner spinnerOffsetX; + private javax.swing.JSpinner spinnerOffsetY; private javax.swing.JSpinner spinnerSpeed; private javax.swing.JTextField textMode; private javax.swing.JTextField textPosition; diff --git a/plugins/RobotPanel.form b/plugins/RobotPanel.form old mode 100644 new mode 100755 diff --git a/plugins/RobotPanel.java b/plugins/RobotPanel.java old mode 100644 new mode 100755 diff --git a/script/.DS_Store b/script/.DS_Store old mode 100644 new mode 100755 diff --git a/script/client/.history b/script/client/.history old mode 100644 new mode 100755 diff --git a/script/client/BerninaRobotClient.py b/script/client/BerninaRobotClient.py old mode 100644 new mode 100755 diff --git a/script/client/PShellClient.py b/script/client/PShellClient.py old mode 100644 new mode 100755 diff --git a/script/client/sseclient.py b/script/client/sseclient.py old mode 100644 new mode 100755 diff --git a/script/client/test.py b/script/client/test.py old mode 100644 new mode 100755 diff --git a/script/devices/Axis.py b/script/devices/Axis.py old mode 100644 new mode 100755 diff --git a/script/devices/RobotBernina.py b/script/devices/RobotBernina.py index eb6db20..407cb26 100644 --- a/script/devices/RobotBernina.py +++ b/script/devices/RobotBernina.py @@ -1,5 +1,5 @@ KNOWN_POINTS = P_PARK, P_HOME = "park", "home" -TASKS = MOVE_PARK, MOVE_HOME, TWEAK_X = "movePark", "moveHome", "tweakX" +TASKS = MOVE_PARK, MOVE_HOME, TWEAK_X , TWEAK_Y = "movePark", "moveHome", "tweakX", "tweakY" DESCS = DESC_FAST,DESC_SLOW, = "mFast", "mSlow" DESC_DEFAULT = DESCS[0] @@ -14,7 +14,7 @@ DEFAULT_SPEED=20 run("devices/RobotTCP") -simulation = False +simulation = True class RobotSC(RobotTCP): @@ -25,7 +25,7 @@ class RobotSC(RobotTCP): self.setPolling(DEFAULT_ROBOT_POLLING) self.last_command_timestamp = None self.last_command_position = None - self.setSimulated() + self.setSimulated() # TODO: Remove me def move_home(self): @@ -43,6 +43,11 @@ class RobotSC(RobotTCP): def tweak_x(self, offset): self.start_task(TWEAK_X, offset) self.wait_task_finished(TASK_WAIT_ROBOT_POLLING) + + + def tweak_y(self, offset): + self.start_task(TWEAK_Y, offset) + self.wait_task_finished(TASK_WAIT_ROBOT_POLLING) def on_event(self,ev): #print "EVT: " + ev @@ -101,7 +106,7 @@ class RobotSC(RobotTCP): raise Exception("Robot not in cleared position") def wait_ready(self): - robot.waitState(State.Ready, 1000) #robot.state.assertReady() + self.waitState(State.Ready, 1000) #robot.state.assertReady() if simulation: add_device(RobotSC("robot","localhost:1000"),force = True) diff --git a/script/devices/RobotMotors.py b/script/devices/RobotMotors.py old mode 100644 new mode 100755 diff --git a/script/devices/RobotTCP.py b/script/devices/RobotTCP.py old mode 100644 new mode 100755 diff --git a/script/local.groovy b/script/local.groovy old mode 100644 new mode 100755 diff --git a/script/local.js b/script/local.js old mode 100644 new mode 100755 diff --git a/script/local.py b/script/local.py old mode 100644 new mode 100755