From 4f0ad0ba9967b77ec80096e85e63ef35c6d91cea Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Thu, 18 Feb 2016 15:05:38 -0800 Subject: [PATCH] make a default intake arm speed constant --- src/org/usfirst/frc/team3501/robot/Constants.java | 1 + .../robot/commands/intakearm/MoveIntakeArmToLevel.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 08dda700..881b07d6 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -133,6 +133,7 @@ public class Constants { public final static double FULL_RANGE = 270.0; // in degrees public final static double OFFSET = -135.0; // in degrees public static final double ZERO_ANGLE = 0; + public static final double DEFAULT_INTAKE_ARM_SPEED = 0.3; } public static class DefenseArm { diff --git a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToLevel.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToLevel.java index 9943bcd8..11a95270 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToLevel.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToLevel.java @@ -1,5 +1,6 @@ package org.usfirst.frc.team3501.robot.commands.intakearm; +import org.usfirst.frc.team3501.robot.Constants.IntakeArm; import org.usfirst.frc.team3501.robot.Robot; import edu.wpi.first.wpilibj.command.CommandGroup; @@ -23,8 +24,8 @@ public class MoveIntakeArmToLevel extends CommandGroup { if (level < 0 || level >= Robot.intakeArm.potAngles.length) this.end(); - addSequential( - new MoveIntakeArmToAngle(Robot.intakeArm.potAngles[level], 0)); + addSequential(new MoveIntakeArmToAngle(Robot.intakeArm.potAngles[level], + IntakeArm.DEFAULT_INTAKE_ARM_SPEED)); } } -- 2.30.2