Test bugfix.

markmaker · Aug 9, 2020 · 190b34b · 190b34b
1 parent 3a94e82
commit 190b34b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/openpnp/gui/components/CameraView.java b/src/main/java/org/openpnp/gui/components/CameraView.java
@@ -1361,7 +1361,7 @@ private void rotateToClick(MouseEvent e) {
 
         double targetAngle = Utils2D.normalizeAngle(-(rotTargetHandleAngle + 90));
         HeadMountable selectedTool = MainFrame.get().getMachineControls().getSelectedTool();
-        
+
         UiUtils.submitUiMachineTask(() -> {
             Location location = selectedTool.getLocation();
             location = location.derive(null, null, null, targetAngle);

diff --git a/src/main/java/org/openpnp/machine/neoden4/NeoDen4Driver.java b/src/main/java/org/openpnp/machine/neoden4/NeoDen4Driver.java
@@ -375,7 +375,6 @@ public void home(ReferenceMachine machine) throws Exception {
         machine.fireMachineHeadActivity(machine.getDefaultHead());
     }
 
-
     @Override
     public void setGlobalOffsets(ReferenceMachine machine, AxesLocation location)
             throws Exception {

diff --git a/src/main/java/org/openpnp/spi/base/AbstractHeadMountable.java b/src/main/java/org/openpnp/spi/base/AbstractHeadMountable.java
@@ -150,8 +150,9 @@ public void moveToSafeZ() throws Exception {
 
     @Override
     public void waitForCompletion(CompletionType completionType) throws Exception {
-        if (getHead().getMachine().isEnabled()) {
-            ((ReferenceMachine) getHead().getMachine())
+        Machine machine = Configuration.get().getMachine();
+        if (machine.isEnabled() && machine instanceof ReferenceMachine) {
+            ((ReferenceMachine) machine)
                 .getMotionPlanner().waitForCompletion(getHead() == null ? null : this, completionType);
         }
     }

diff --git a/src/test/java/SampleJobTest.java b/src/test/java/SampleJobTest.java
@@ -35,7 +35,7 @@ public class SampleJobTest {
      * So if the simulation tries to pick or place at the wrong location, the test fails.
      * 
      * Unfortunately, it is terribly slow as some aspects (camera settling/vibration) need to be simulated in 
-     * quasi real-time to be conclusive as a test. 
+     * quasi real-time to be conclusive as a test. Takes about 2 min.
      * 
      */
     final public static boolean imperfectMachine = false;