From: Cindy Zhang Date: Sat, 13 Feb 2016 21:41:36 +0000 (-0800) Subject: change current x and y position to values gotten by MoveDefenseArmHorizontal instead... X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=a2047467293519d0bd031d94f30b23bea84a5e93;p=3501%2Fstronghold-2016 change current x and y position to values gotten by MoveDefenseArmHorizontal instead of input values --- diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveDefenseArmHorizontal.java b/src/org/usfirst/frc/team3501/robot/commands/MoveDefenseArmHorizontal.java index 31ddf52f..f07cfc06 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/MoveDefenseArmHorizontal.java +++ b/src/org/usfirst/frc/team3501/robot/commands/MoveDefenseArmHorizontal.java @@ -1,5 +1,7 @@ package org.usfirst.frc.team3501.robot.commands; +import org.usfirst.frc.team3501.robot.Robot; + import edu.wpi.first.wpilibj.command.CommandGroup; /** @@ -7,8 +9,9 @@ import edu.wpi.first.wpilibj.command.CommandGroup; */ public class MoveDefenseArmHorizontal extends CommandGroup { - public MoveDefenseArmHorizontal(double x, double y, - double horizontalDisplacement) { + public MoveDefenseArmHorizontal(double horizontalDisplacement) { + double x = Robot.defenseArm.getArmHorizontalDisplacement(); + double y = Robot.defenseArm.getArmVerticalDisplacement(); addSequential(new MoveDefenseArm(x + horizontalDisplacement, y)); } }