|
10 | 10 | import choreo.auto.AutoFactory.AutoBindings;
|
11 | 11 | import choreo.auto.AutoRoutine;
|
12 | 12 | import dev.doglog.DogLog;
|
13 |
| -import choreo.auto.AutoTrajectory; |
14 | 13 | import frc.robot.subsystems.Swerve;
|
15 | 14 |
|
16 | 15 | public class Autos {
|
@@ -48,21 +47,22 @@ public AutoRoutine simpleTrajectory() {
|
48 | 47 | return routine;
|
49 | 48 | }
|
50 | 49 |
|
51 |
| - public AutoRoutine branchingAuto(){ |
52 |
| - final boolean _branch = true; // Change this if you want the auton to branch (Maybe simulate some trigger later) |
| 50 | + public AutoRoutine branchingAuto() { |
| 51 | + final boolean branch = |
| 52 | + true; // Change this if you want the auton to branch (Maybe simulate some trigger later) |
53 | 53 |
|
54 |
| - AutoRoutine routine = _factory.newRoutine("branchingAuto"); |
| 54 | + var routine = _factory.newRoutine("branchingAuto"); |
55 | 55 |
|
56 | 56 | // Loading traj
|
57 |
| - AutoTrajectory startToM1 = routine.trajectory("startToM1"); |
58 |
| - AutoTrajectory M1toScore = routine.trajectory("M1toScore"); |
59 |
| - AutoTrajectory M1toM2 = routine.trajectory("M1toM2"); |
60 |
| - AutoTrajectory M2toScore = routine.trajectory("M2toScore"); |
| 57 | + var startToM1 = routine.trajectory("startToM1"); |
| 58 | + var M1toScore = routine.trajectory("M1toScore"); |
| 59 | + var M1toM2 = routine.trajectory("M1toM2"); |
| 60 | + var M2toScore = routine.trajectory("M2toScore"); |
61 | 61 |
|
62 | 62 | routine.active().onTrue(sequence(routine.resetOdometry(startToM1), startToM1.cmd()));
|
63 | 63 |
|
64 |
| - startToM1.done().and(() -> _branch).onTrue(M1toM2.cmd()); |
65 |
| - startToM1.done().and(() -> !_branch).onTrue(M1toScore.cmd()); |
| 64 | + startToM1.done().and(() -> branch).onTrue(M1toM2.cmd()); |
| 65 | + startToM1.done().and(() -> !branch).onTrue(M1toScore.cmd()); |
66 | 66 |
|
67 | 67 | M1toM2.done().onTrue(M2toScore.cmd());
|
68 | 68 |
|
|
0 commit comments