diff --git a/src/main/java/frc/robot/Autos.java b/src/main/java/frc/robot/Autos.java index 030a63be..b9bc5963 100644 --- a/src/main/java/frc/robot/Autos.java +++ b/src/main/java/frc/robot/Autos.java @@ -526,19 +526,6 @@ public Command createAuto( return routine.cmd(); } - public Command getDepotScoreClimbAuto() { - return createAuto( - "Depot Score Climb Auto", - new Path[] { - Path.LTrenchtoDepot, - Path.DepottoLPreTrench, - Path.LPreTrenchtoLNeutral, - Path.LNeutraltoLPreTrench, - Path.LPreTrenchtoLClimb - }, - setLeftClimb()); - } - public Command getDoubleDipRightTrench() { return createAuto( "Double dip right trench auto", @@ -551,122 +538,6 @@ public Command getDoubleDipRightTrench() { setRightClimb()); } - public Command getOutpostScoreClimbAuto() { - - return createAuto( - "Outpost Score Climb Auto", - new Path[] { - Path.RTrenchtoOutpost, - Path.OutposttoRPreTrench, - Path.RPreTrenchtoRNeutral, - Path.RNeutraltoRPreTrenchReversed, - Path.RPreTrenchtoRClimb - }, - setRightClimb()); - } - - public Command getDepotFeedClimbAuto() { - return createAuto( - "Depot Feed Climb Auto", - new Path[] { - Path.LTrenchtoDepot, - Path.DepottoLPreTrench, - Path.LPreTrenchtoLNeutral, - Path.FeedLNeutraltoLPreTrench, - Path.LPreTrenchtoLClimb - }, - setLeftClimb()); - } - - public Command getOutpostFeedClimbAuto() { - - return createAuto( - "Outpost Feed Climb Auto", - new Path[] { - Path.RTrenchtoOutpost, - Path.OutposttoRPreTrench, - Path.RPreTrenchtoRNeutral, - Path.FeedRNeutraltoRPreTrench, - Path.RPreTrenchtoRClimb - }, - setRightClimb()); - } - - // awful names.. mb - public Command getFillDepotScoreClimbAuto() { - return createAuto( - "Fill Depot Score Climb Auto", - new Path[] { - Path.StartingLTrenchtoLNeutral, - Path.FeedLNeutraltoLPreTrench, - Path.LPreTrenchtoDepot, - Path.DepottoLClimb - }, - setLeftClimb()); - } - - public Command getFillOutpostScoreClimbAuto() { - - return createAuto( - "Fill Outpost Score Climb Auto", - new Path[] { - Path.StartingRTrenchtoRNeutral, - Path.FeedRNeutraltoRPreTrench, - Path.RPreTrenchReversedtoOutpost, - Path.OutposttoRClimb - }, - setRightClimb()); - } - - public Command getRightBumpOutpostCenterAuto() { - - return createAuto( - "Right Bump Outpost Center Auto", - new Path[] { - Path.RBumptoOutpost, - Path.OutposttoRPreTrench, - Path.RPreTrenchtoRNeutral, - Path.RNeutraltoRPreTrenchReversed - }, - setRightClimb()); - } - - public Command getDepotClimbAuto() { - - return createAuto( - "Depot Climb Auto", new Path[] {Path.LTrenchtoDepot, Path.DepottoLClimb}, setLeftClimb()); - } - - public Command getOutpostClimbAuto() { - - return createAuto( - "Outpost Climb Auto", - new Path[] {Path.RTrenchtoOutpost, Path.OutposttoPreOutpost, Path.PreOutposttoRClimb}, - setRightClimb()); - } - - public Command getDepotOutpostClimbAuto() { - return createAuto( - "Depot Outpost Climb Auto", - new Path[] { - Path.LTrenchtoDepot, - Path.DepottoPreOutpost, - Path.PreOutposttoOutpost, - Path.OutposttoRClimb - }, - setRightClimb()); - } - - public Command getLeftBumpDepotOutpostClimbAuto() { - return createAuto( - "Left Bump Outpost Climb Auto", - new Path[] { - Path.LBumptoDepot, Path.DepottoPreOutpost, Path.PreOutposttoOutpost, Path.OutposttoRClimb - }, - setRightClimb(), - shootPreload()); - } - public Command getHubDepotOutpostAuto() { return createAuto( "Hub Depot Outpost Auto", @@ -683,19 +554,6 @@ public Command getHubOutpostDepotAuto() { Commands.none()); } - // this is so cursed and im not proud of it - public Command getRightBumpOutpostClimbAuto() { - return createAuto( - "Right Bump Outpost Climb Auto", - new Path[] {Path.RBumptoOutpost, Path.noScoreOutposttoRClimb}, - setRightClimb()); - } - - public Command getCenterScoreAuto() { - // no climb so don't need to set climb target - return createAuto("Center Score Auto", new Path[] {Path.HubtoCenter}, Commands.none()); - } - public Command getRightNeutralOutpostScore() { return createAuto( "Right Neutral Outpost Score", @@ -708,15 +566,6 @@ public Command getRightNeutralOutpostScore() { setRightClimb()); } - // public Command getLeftNeutralOutpostScore() { - // return createAuto( - // "Left Neutral Outpost Score", - // new Path[] { - // Path.StartingLTrenchtoLNeutral, Path.LNeutraltoLPreTrench, Path.LPreTrenchtoDepot - // }, - // setLeftClimb()); - // } - public Command getLeftNeutralScoreTwice() { return createAuto( "Left Neutral Score Twice", diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java index 3d12c66f..f9ee3842 100644 --- a/src/main/java/frc/robot/Robot.java +++ b/src/main/java/frc/robot/Robot.java @@ -787,22 +787,10 @@ private void addAutos() { System.out.println("------- Regenerating Autos"); System.out.println( "Regenerating Autos on " + DriverStation.getAlliance().map((a) -> a.toString())); - autoChooser.addOption("Depot Feed Climb", autos.getDepotFeedClimbAuto()); - autoChooser.addOption("Depot Score Climb", autos.getDepotScoreClimbAuto()); - autoChooser.addOption("Outpost Feed Climb", autos.getOutpostFeedClimbAuto()); - autoChooser.addOption("Outpost Score Climb", autos.getOutpostScoreClimbAuto()); - autoChooser.addOption("Fill Depot Score Climb", autos.getFillDepotScoreClimbAuto()); - autoChooser.addOption("Fill Outpost Score Climb", autos.getFillOutpostScoreClimbAuto()); - autoChooser.addOption("Depot Climb", autos.getDepotClimbAuto()); - autoChooser.addOption("Depot Outpost Climb", autos.getDepotOutpostClimbAuto()); - autoChooser.addOption("Outpost Climb", autos.getOutpostClimbAuto()); - autoChooser.addOption("Score in Center", autos.getCenterScoreAuto()); + autoChooser.addOption("Test Auto", autos.getTestAuto()); autoChooser.addOption("Just Score", autos.getJustScoreAuto()); - autoChooser.addOption( - "Left Bump Depot Outpost Climb", autos.getLeftBumpDepotOutpostClimbAuto()); - autoChooser.addOption("Right Bump Outpost Climb", autos.getRightBumpOutpostClimbAuto()); - autoChooser.addOption("Right Bump Outpost Center", autos.getRightBumpOutpostCenterAuto()); + autoChooser.addOption("Right Trench Double Dip Auto", autos.getDoubleDipRightTrench()); autoChooser.addOption("Left Neutral Score Twice", autos.getLeftNeutralScoreTwice()); // autoChooser.addOption("Left Neutral Outpost Score", autos.getLeftNeutralOutpostScore());