diff --git a/src/org/usfirst/frc/team2059/robot/Robot.java b/src/org/usfirst/frc/team2059/robot/Robot.java index 5aee16b..ec33e89 100644 --- a/src/org/usfirst/frc/team2059/robot/Robot.java +++ b/src/org/usfirst/frc/team2059/robot/Robot.java @@ -15,10 +15,8 @@ public class Robot extends IterativeRobot { CommandBase.init(); oi = new OI(); chooser = new SendableChooser(); - chooser.addDefault("Time based drive", new RoutineDriveTime()); chooser.addObject("Time based defense", new RoutineDefenseTime()); - SmartDashboard.putData("Auto mode", chooser); SmartDashboard.putData("MainArm", CommandBase.mainArm.getPIDController()); SmartDashboard.putData("LeftEncoderController", CommandBase.driveBase.getLeftController()); diff --git a/src/org/usfirst/frc/team2059/robot/commands/autonomous/AutoDriveTime.java b/src/org/usfirst/frc/team2059/robot/commands/autonomous/AutoDriveTime.java index a7a6788..6323183 100644 --- a/src/org/usfirst/frc/team2059/robot/commands/autonomous/AutoDriveTime.java +++ b/src/org/usfirst/frc/team2059/robot/commands/autonomous/AutoDriveTime.java @@ -5,13 +5,13 @@ public class AutoDriveTime extends CommandBase { double power; public AutoDriveTime(double timeout, double power) { requires(driveBase); - this.power=power; + this.power = power; setTimeout(timeout); } protected void initialize() { } protected void execute() { - driveBase.driveArcade(0,-power,0,0); + driveBase.driveArcade(0, -power, 0, 0); } protected void end() { driveBase.stopDriving(); diff --git a/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDefenseTime.java b/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDefenseTime.java index 1cd7735..6d65c8e 100644 --- a/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDefenseTime.java +++ b/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDefenseTime.java @@ -2,13 +2,13 @@ package org.usfirst.frc.team2059.robot.commands.autonomous; import org.usfirst.frc.team2059.robot.commands.CommandBase; import edu.wpi.first.wpilibj.command.CommandGroup; import org.usfirst.frc.team2059.robot.Robot; -public class RoutineDefenseTime extends CommandGroup{ - public RoutineDefenseTime(){ - addSequential(new AutoSetArmStopState(true)); - addSequential(new AutoResetLower(-1)); - addSequential(new AutoSetArmPosition(15)); - addSequential(new AutoSetArmStopState(false)); - addSequential(new AutoSetArmPosition(11)); +public class RoutineDefenseTime extends CommandGroup { + public RoutineDefenseTime() { + addSequential(new AutoSetArmStopState(true)); + addSequential(new AutoResetLower(-1)); + addSequential(new AutoSetArmPosition(15)); + addSequential(new AutoSetArmStopState(false)); + addSequential(new AutoSetArmPosition(11)); // addSequential(new AutoDriveTime(2,.5)); - } + } } diff --git a/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDriveTime.java b/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDriveTime.java index 5a66a7b..f232f48 100644 --- a/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDriveTime.java +++ b/src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDriveTime.java @@ -2,9 +2,9 @@ package org.usfirst.frc.team2059.robot.commands.autonomous; import org.usfirst.frc.team2059.robot.commands.CommandBase; import edu.wpi.first.wpilibj.command.CommandGroup; import org.usfirst.frc.team2059.robot.Robot; -public class RoutineDriveTime extends CommandGroup{ - public RoutineDriveTime(){ - addSequential(new AutoResetLower(-1)); - addSequential(new AutoDriveTime(2,.5)); - } +public class RoutineDriveTime extends CommandGroup { + public RoutineDriveTime() { + addSequential(new AutoResetLower(-1)); + addSequential(new AutoDriveTime(2, .5)); + } }