Fix merge conflicts

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / commands / auton / CompactRobot.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/CompactRobot.java b/src/org/usfirst/frc/team3501/robot/commands/auton/CompactRobot.java
index bde8aba299ef18f44feb06183157991eaab1b7d1..1dac8a77d9b81c560d1107d70862f94732e0029e 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/CompactRobot.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/CompactRobot.java
@@ -1,44 +1,19 @@
 package org.usfirst.frc.team3501.robot.commands.auton;
 
-import edu.wpi.first.wpilibj.command.Command;
+import org.usfirst.frc.team3501.robot.Robot;
+import org.usfirst.frc.team3501.robot.commands.intakearm.MoveIntakeArmToAngle;
+import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
+
+import edu.wpi.first.wpilibj.command.CommandGroup;
 
 /**
  *
  */
-public class CompactRobot extends Command {
+public class CompactRobot extends CommandGroup {
 
   public CompactRobot() {
-    // Use requires() here to declare subsystem dependencies
-    // eg. requires(chassis);
-  }
-
-  // Called just before this Command runs the first time
-  @Override
-  protected void initialize() {
-    // move hood down
-    // move intakeArm out
-    // move defenseArm down
-  }
-
-  // Called repeatedly when this Command is scheduled to run
-  @Override
-  protected void execute() {
-  }
-
-  // Make this return true when this Command no longer needs to run execute()
-  @Override
-  protected boolean isFinished() {
-    return false;
-  }
-
-  // Called once after isFinished returns true
-  @Override
-  protected void end() {
-  }
-
-  // Called when another command which requires one or more of the same
-  // subsystems is scheduled to run
-  @Override
-  protected void interrupted() {
+    addSequential(new MoveIntakeArmToAngle(IntakeArm.potAngles[3],
+        IntakeArm.moveIntakeArmSpeed));
+    Robot.shooter.lowerHood();
   }
 }