Merge branch 'MentorSandbox'

Former-commit-id: 13e10d851194d17067d830d6eba38a06e011e312 Former-commit-id: fc87304
SwerveRobotics · Nov 29, 2015 · 24fcdeb · 24fcdeb
2 parents fabfe61 + 587586a
commit 24fcdeb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...sLibrary/src/main/java/org/swerverobotics/library/internal/EasyModernMotorController.java b/...sLibrary/src/main/java/org/swerverobotics/library/internal/EasyModernMotorController.java
@@ -314,8 +314,8 @@ private void deusurpDevices()
         // to the USB device actually happen when we issue them.
         if (mode == RunMode.RESET_ENCODERS)
             {
-            // Unclear if this is needed
-            while (this.getMotorTargetPosition(motor) != 0)
+            // Unclear if this is needed, but anecdotes from (e.g.) Dryw seem to indicate that it is
+            while (this.getMotorCurrentPosition(motor) != 0)
                 {
                 waitForNextReadComplete();
                 }