X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=9bc45b8f2c73ca742e7f332ff1fee083c63201ca;hp=eb66cfb9d64bbd81370bbd11e3ee32045a2e2dc8;hb=c442f9db3944ae096cdb13cbc2ad6687c513f3f0;hpb=4f03bb5589e09d5238b5575668af6deb46cc74ef diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index eb66cfb9..9bc45b8f 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -1,7 +1,6 @@ package org.usfirst.frc.team3501.robot; import org.usfirst.frc.team3501.robot.Constants.Defense; -import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance; import org.usfirst.frc.team3501.robot.subsystems.DefenseArm; import org.usfirst.frc.team3501.robot.subsystems.DriveTrain; import org.usfirst.frc.team3501.robot.subsystems.IntakeArm; @@ -126,21 +125,22 @@ public class Robot extends IterativeRobot { @Override public void autonomousPeriodic() { Scheduler.getInstance().run(); - } - - @Override - public void teleopInit() { - Scheduler.getInstance().add(new DriveDistance(24, 5)); + // Scheduler.getInstance().add(new DriveDistance(24, 5)); // Scheduler.getInstance().add(new DriveForTime(2, 0.3)); // Scheduler.getInstance().add(new TurnForAngle(90, 5)); // Scheduler.getInstance().add( // new TurnForTime(3, Constants.Direction.RIGHT, 0.3)); // Scheduler.getInstance().add( // new TurnForTime(3, Constants.Direction.LEFT, 0.3)); - // Scheduler.getInstance().add(new JoystickDrive()); // Scheduler.getInstance().add(new Turn180()); } + @Override + public void teleopInit() { + // Scheduler.getInstance().add(new JoystickDrive()); + + } + @Override public void teleopPeriodic() { Scheduler.getInstance().run();