From: Shaina Chen Date: Fri, 12 Feb 2016 02:53:19 +0000 (-0800) Subject: change name of command to SetArmToAngle X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=915269db9e316cc63ea98058708153411063c719 change name of command to SetArmToAngle --- diff --git a/src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java b/src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java index a073fa83..a3cb6d45 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java @@ -9,7 +9,7 @@ public class RetractDefenseArm extends CommandGroup { public RetractDefenseArm(double speed, double retractPosition) { requires(Robot.defenseArm); - addParallel(new SetArmToLevel(speed, retractPosition)); + addParallel(new SetArmToAngle(speed, retractPosition)); addParallel(new SetHandToLevel(speed, retractPosition)); } } diff --git a/src/org/usfirst/frc/team3501/robot/commands/SetArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/SetArmToAngle.java new file mode 100755 index 00000000..02d6e827 --- /dev/null +++ b/src/org/usfirst/frc/team3501/robot/commands/SetArmToAngle.java @@ -0,0 +1,60 @@ +package org.usfirst.frc.team3501.robot.commands; + +import org.usfirst.frc.team3501.robot.Robot; + +import edu.wpi.first.wpilibj.command.Command; + +public class SetArmToAngle extends Command { + private static final double THRESHOLD = 0.1; + private double speed; + private double targetPosition; + private double currentPosition; + private boolean isDecreasing = false; + + public SetArmToAngle(double speed, double targetPosition) { + requires(Robot.defenseArm); + + this.speed = speed; + this.targetPosition = targetPosition; + } + + @Override + public void initialize() { + currentPosition = Robot.defenseArm.getArmPotAngle(); + + if (currentPosition > targetPosition) { + Robot.defenseArm.setArmSpeed(-speed); + isDecreasing = true; + } else { + Robot.defenseArm.setArmSpeed(speed); + isDecreasing = false; + } + } + + @Override + public void execute() { + + } + + @Override + public boolean isFinished() { + currentPosition = Robot.defenseArm.getArmPotAngle(); + + if (isDecreasing == true) { + return (currentPosition <= targetPosition + THRESHOLD); + } else { + return (currentPosition >= targetPosition - THRESHOLD); + } + } + + @Override + public void end() { + Robot.defenseArm.setArmSpeed(0); + } + + @Override + protected void interrupted() { + end(); + } + +} diff --git a/src/org/usfirst/frc/team3501/robot/commands/SetArmToLevel.java b/src/org/usfirst/frc/team3501/robot/commands/SetArmToLevel.java deleted file mode 100755 index 7716629f..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/SetArmToLevel.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -import org.usfirst.frc.team3501.robot.Robot; - -import edu.wpi.first.wpilibj.command.Command; - -public class SetArmToLevel extends Command { - private static final double THRESHOLD = 0.1; - private double speed; - private double targetPosition; - private double currentPosition; - private boolean isDecreasing = false; - - public SetArmToLevel(double speed, double targetPosition) { - requires(Robot.defenseArm); - - this.speed = speed; - this.targetPosition = targetPosition; - } - - @Override - public void initialize() { - currentPosition = Robot.defenseArm.getArmPotAngle(); - - if (currentPosition > targetPosition) { - Robot.defenseArm.setArmSpeed(-speed); - isDecreasing = true; - } else { - Robot.defenseArm.setArmSpeed(speed); - isDecreasing = false; - } - } - - @Override - public void execute() { - - } - - @Override - public boolean isFinished() { - currentPosition = Robot.defenseArm.getArmPotAngle(); - - if (isDecreasing == true) { - return (currentPosition <= targetPosition + THRESHOLD); - } else { - return (currentPosition >= targetPosition - THRESHOLD); - } - } - - @Override - public void end() { - Robot.defenseArm.setArmSpeed(0); - } - - @Override - protected void interrupted() { - end(); - } - -}