Team4388/2018-Robot
1
0
Fork 0
mirror of https://github.com/Team4388/2018-Robot.git synced 2026-06-09 00:38:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update in Auton Chooser

Browse Source 
Center Right added to Auton Chooser. ***Doesn't run center left or center right with selection of RL in auton chooser smartdashboard
This commit is contained in:
mayabartels
2018-03-05 22:27:44 -07:00
parent 797a8a2b42
commit 3371af60cf
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/usfirst/frc4388/robot/Robot.java
+5 -1
View File
@@ -128,6 +128,7 @@ public class Robot extends IterativeRobot
RRautonTaskChooser.addObject("2", new CrossTheBaseLine()); RRautonTaskChooser.addObject("2", new CrossTheBaseLine());
RRautonTaskChooser.addObject("Center to Left Switch", new CenterLeft()); RRautonTaskChooser.addObject("Center to Left Switch", new CenterLeft());
RRautonTaskChooser.addObject("Center to Right Switch", new CenterRight());
RRautonTaskChooser.addObject("3", new CrossTheBaseLine()); RRautonTaskChooser.addObject("3", new CrossTheBaseLine());
RRautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton()); RRautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton());
@@ -149,6 +150,7 @@ public class Robot extends IterativeRobot
RLautonTaskChooser.addObject("2", new CrossTheBaseLine()); RLautonTaskChooser.addObject("2", new CrossTheBaseLine());
RLautonTaskChooser.addObject("Center to Left Switch", new CenterLeft()); RLautonTaskChooser.addObject("Center to Left Switch", new CenterLeft());
RLautonTaskChooser.addObject("Center to Right Switch", new CenterRight());
RLautonTaskChooser.addObject("3", new CrossTheBaseLine()); RLautonTaskChooser.addObject("3", new CrossTheBaseLine());
RLautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton()); RLautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton());
@@ -171,6 +173,7 @@ public class Robot extends IterativeRobot
LLautonTaskChooser.addObject("2", new CrossTheBaseLine()); LLautonTaskChooser.addObject("2", new CrossTheBaseLine());
LLautonTaskChooser.addObject("Center to Left Switch", new CenterLeft()); LLautonTaskChooser.addObject("Center to Left Switch", new CenterLeft());
LLautonTaskChooser.addObject("Center to Right Switch", new CenterRight());
LLautonTaskChooser.addObject("3", new CrossTheBaseLine()); LLautonTaskChooser.addObject("3", new CrossTheBaseLine());
LLautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton()); LLautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton());
@@ -191,7 +194,8 @@ public class Robot extends IterativeRobot
LRautonTaskChooser.addObject("Left to Right Switch", new LeftStartRightScore()); LRautonTaskChooser.addObject("Left to Right Switch", new LeftStartRightScore());
LRautonTaskChooser.addObject("2", new CrossTheBaseLine()); LRautonTaskChooser.addObject("2", new CrossTheBaseLine());
LRautonTaskChooser.addObject("Center Left Switch", new CenterLeft()); LRautonTaskChooser.addObject("Center to Left Switch", new CenterLeft());
LRautonTaskChooser.addObject("Center to Right Switch", new CenterRight());
LRautonTaskChooser.addObject("3", new CrossTheBaseLine()); LRautonTaskChooser.addObject("3", new CrossTheBaseLine());
LRautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton()); LRautonTaskChooser.addObject("Right to Right Switch", new RightSwitchAuton());
src/org/usfirst/frc4388/robot/commands/auton/CenterLeft.java
+3 -3
View File
@@ -29,10 +29,10 @@ public class CenterLeft extends CommandGroup {
addSequential(new IntakePosition(true)); addSequential(new IntakePosition(true));
addSequential(new DriveStraightBasic(-15, 60, true, true, 0)); addSequential(new DriveStraightBasic(-15, 60, true, true, 0));
addSequential(new DriveTurnBasic(true, 130, 300, MPSoftwareTurnType.TANK)); addSequential(new DriveTurnBasic(true, 130, 300, MPSoftwareTurnType.TANK));
addSequential(new DriveStraightBasic(65, 60, true, true, 0)); addSequential(new DriveStraightBasic(53, 60, true, true, 0));
addSequential(new DriveTurnBasic(true, 28, 300, MPSoftwareTurnType.TANK));
addSequential(new ElevatorBasic(20)); addSequential(new ElevatorBasic(20));
addSequential(new DriveStraightBasic(30, 60, true, true, 0)); addSequential(new DriveTurnBasic(true, 34.5, 300, MPSoftwareTurnType.TANK));
addSequential(new DriveStraightBasic(19, 60, true, true, 0));
addSequential(new IntakeSetSpeed(Carriage.CUBE_EJECT_SPEED)); addSequential(new IntakeSetSpeed(Carriage.CUBE_EJECT_SPEED));
//addSequential(new WaitCommand(.1)); //addSequential(new WaitCommand(.1));
addSequential(new IntakePosition(false)); addSequential(new IntakePosition(false));
src/org/usfirst/frc4388/robot/commands/auton/CenterRight.java
+2 -2
View File
@@ -20,8 +20,8 @@ import edu.wpi.first.wpilibj.command.WaitCommand;
/** /**
* *
*/ */
public class CenterRight extends CommandGroup public class CenterRight extends CommandGroup {
{
public CenterRight() public CenterRight()
{ {
addSequential(new DriveGyroReset()); addSequential(new DriveGyroReset());