From a8329166d594a2da734e46c04ea8d8316690b5e3 Mon Sep 17 00:00:00 2001 From: Shaina Chen Date: Thu, 4 Feb 2016 20:06:34 -0800 Subject: [PATCH] delete setRollerVoltage method, add javadoc style comment for intakeBall and outputBall methods, fill in getRollerVoltage method --- .../team3501/robot/subsystems/IntakeArm.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java index 16517904..3fa5d3e9 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java @@ -36,6 +36,10 @@ public class IntakeArm extends Subsystem { * Must be used in a command that has a timer variable to stop it. */ + /*** + * These two methods (intakeBall and outputBall)sets the voltage of the motor. + * The voltage values are constants in Constants class + */ public void intakeBall() { intakeRoller.set(Constants.IntakeArm.INTAKE_SPEED); } @@ -44,21 +48,6 @@ public class IntakeArm extends Subsystem { intakeRoller.set(Constants.IntakeArm.OUTPUT_SPEED); } - /*** - * This method allows you to set the voltage of the motor. The range of - * voltage is from [-1, 1]. A negative voltage makes the motor run backwards. - * - * @param voltage - * The voltage of the motors that control the rollers. The range of - * these motors go from [-1,1]. A negative voltage makes the motor - * run - * backwards. - */ - - public void setRollerVoltage(double voltage) { - - } - /*** * This method gets you the current voltage of the motor that controls the * intake arm. The range of voltage is from [-1,1]. @@ -70,7 +59,7 @@ public class IntakeArm extends Subsystem { */ public double getRollerVoltage() { - return 0; + return intakeRoller.get(); } /*** -- 2.30.2