fill in areRollersRolling()
authorLauren Meier <meier.lauren@gmail.com>
Wed, 10 Feb 2016 02:51:41 +0000 (18:51 -0800)
committerLauren Meier <meier.lauren@gmail.com>
Sat, 13 Feb 2016 22:36:59 +0000 (14:36 -0800)
src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java

index ceac71fb1d4ca5a424c01b26eb10168658f9c94c..afcc16f6a3f719a8d883f021dc8c1c4f0dc69fb2 100755 (executable)
@@ -30,7 +30,6 @@ public class IntakeArm extends Subsystem {
     intakeArm = new CANTalon(Constants.IntakeArm.ARM_PORT);
     intakePot = new AnalogPotentiometer(Constants.IntakeArm.POT_CHANNEL,
         Constants.IntakeArm.FULL_RANGE, Constants.IntakeArm.OFFSET);
-
   }
 
   /***
@@ -117,6 +116,8 @@ public class IntakeArm extends Subsystem {
    */
 
   public boolean areRollersRolling() {
+    if (Math.abs(getRollerVoltage()) < 0.02)
+      return false;
     return true;
   }