From 06bf5f4d4eb322378cade9bf77b3f8ffcdc42c80 Mon Sep 17 00:00:00 2001 From: Robert Atkinson Date: Fri, 27 Nov 2015 14:22:43 -0800 Subject: [PATCH] don't check run mode in isBusy(): more useful, matches ftchq Former-commit-id: 5ed39b78ef17795c0c5f3c69577668ac015fd66e Former-commit-id: 729000e1eccefe251c6872fdbbabbbcda53491c8 --- .../library/internal/EasyModernMotorController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SwerveRoboticsLibrary/src/main/java/org/swerverobotics/library/internal/EasyModernMotorController.java b/SwerveRoboticsLibrary/src/main/java/org/swerverobotics/library/internal/EasyModernMotorController.java index 7455c2837ea..bb2feadab57 100644 --- a/SwerveRoboticsLibrary/src/main/java/org/swerverobotics/library/internal/EasyModernMotorController.java +++ b/SwerveRoboticsLibrary/src/main/java/org/swerverobotics/library/internal/EasyModernMotorController.java @@ -252,9 +252,8 @@ private void deusurpDevices() int cur = getMotorCurrentPosition(motor); int tar = getMotorTargetPosition(motor); - RunMode mode = getMotorChannelMode(motor); - return mode==RunMode.RUN_TO_POSITION && (Math.abs(cur - tar) > busyThreshold); + return (Math.abs(cur - tar) > busyThreshold); } @Override public synchronized double getMotorPower(int motor)