From: Lauren Meier Date: Wed, 10 Feb 2016 02:51:41 +0000 (-0800) Subject: fill in areRollersRolling() X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=42c4c7342f1a7aca6633b4c00126fac814c51dd1 fill in areRollersRolling() --- diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java index ceac71fb..afcc16f6 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java @@ -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; }