diff --git a/src/main/deploy/pathplanner/MiddleRamTotes.path b/src/main/deploy/pathplanner/MiddleRamTotes.path deleted file mode 100644 index 99f1369..0000000 --- a/src/main/deploy/pathplanner/MiddleRamTotes.path +++ /dev/null @@ -1,124 +0,0 @@ -{ - "waypoints": [ - { - "anchorPoint": { - "x": 0.6158477320815577, - "y": 4.116044940370502 - }, - "prevControl": null, - "nextControl": { - "x": 1.6037801505537512, - "y": 4.116044940370502 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.654459635416666, - "y": 4.1569875081380205 - }, - "prevControl": { - "x": 7.796973950935132, - "y": 3.3502872351444126 - }, - "nextControl": { - "x": 7.796973950935132, - "y": 3.3502872351444126 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 6.433297821969697, - "y": 3.0084801876183715 - }, - "prevControl": { - "x": 6.885442560369318, - "y": 3.1184988310842807 - }, - "nextControl": { - "x": 5.981153083570076, - "y": 2.8984615441524624 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 8.310612534031723, - "y": 2.632998379794034 - }, - "prevControl": { - "x": 7.503466057054923, - "y": 2.5783598928740536 - }, - "nextControl": { - "x": 9.117759011008523, - "y": 2.6876368667140147 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 2.2197980013760654, - "y": 0.6195567737926136 - }, - "prevControl": { - "x": 1.436874158454664, - "y": 0.6255345200047344 - }, - "nextControl": null, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - } - ], - "markers": [] -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/MiddleRamTotesOther.path b/src/main/deploy/pathplanner/MiddleRamTotesOther.path deleted file mode 100644 index 48b0992..0000000 --- a/src/main/deploy/pathplanner/MiddleRamTotesOther.path +++ /dev/null @@ -1,124 +0,0 @@ -{ - "waypoints": [ - { - "anchorPoint": { - "x": 0.6158477320815577, - "y": 4.116044940370502 - }, - "prevControl": null, - "nextControl": { - "x": 1.6037801505537512, - "y": 4.116044940370502 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.654459635416666, - "y": 4.1569875081380205 - }, - "prevControl": { - "x": 7.796973950935132, - "y": 3.3502872351444126 - }, - "nextControl": { - "x": 7.796973950935132, - "y": 3.3502872351444126 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 6.568103212298769, - "y": 5.072489420572917 - }, - "prevControl": { - "x": 7.077854040897253, - "y": 5.066060846502131 - }, - "nextControl": { - "x": 7.077854040897253, - "y": 5.066060846502131 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 7.928515809955019, - "y": 5.796904130415483 - }, - "prevControl": { - "x": 7.121369332978219, - "y": 5.742265643495503 - }, - "nextControl": { - "x": 7.121369332978219, - "y": 5.742265643495503 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 2.2197980013760654, - "y": 0.6195567737926136 - }, - "prevControl": { - "x": 1.436874158454664, - "y": 0.6255345200047344 - }, - "nextControl": null, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - } - ], - "markers": [] -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/RamMoreTotes.path b/src/main/deploy/pathplanner/RamMoreTotes.path deleted file mode 100644 index 08e2bf3..0000000 --- a/src/main/deploy/pathplanner/RamMoreTotes.path +++ /dev/null @@ -1,127 +0,0 @@ -{ - "waypoints": [ - { - "anchorPoint": { - "x": 0.609663764555069, - "y": 1.828991293665207 - }, - "prevControl": null, - "nextControl": { - "x": 1.219327529110138, - "y": 1.828991293665207 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.296702991832387, - "y": 1.491758404356061 - }, - "prevControl": { - "x": 8.550967129794033, - "y": 1.9284889914772727 - }, - "nextControl": { - "x": 8.550967129794033, - "y": 1.9284889914772727 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 6.572468150745738, - "y": 2.9395280317826704 - }, - "prevControl": { - "x": 8.28287575461648, - "y": 2.903560754024621 - }, - "nextControl": { - "x": 8.28287575461648, - "y": 2.903560754024621 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.211617209694602, - "y": 4.248068607214726 - }, - "prevControl": { - "x": 8.584635416666666, - "y": 3.909630052971117 - }, - "nextControl": { - "x": 8.584635416666666, - "y": 3.909630052971117 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 2.0719239206025097, - "y": 0.7113249807646777 - }, - "prevControl": { - "x": 0.7928614760890151, - "y": 0.2514657685250951 - }, - "nextControl": null, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - } - ], - "maxVelocity": 5.0, - "maxAcceleration": null, - "isReversed": false, - "markers": [] -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/RamSide5Totes .path b/src/main/deploy/pathplanner/RamSide5Totes .path deleted file mode 100644 index 6169dbe..0000000 --- a/src/main/deploy/pathplanner/RamSide5Totes .path +++ /dev/null @@ -1,124 +0,0 @@ -{ - "waypoints": [ - { - "anchorPoint": { - "x": 0.7207225452769886, - "y": 1.9404944217566291 - }, - "prevControl": null, - "nextControl": { - "x": 1.7086549637491797, - "y": 1.9404944217566291 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.619107333096592, - "y": 0.721403179746686 - }, - "prevControl": { - "x": 7.885150331439394, - "y": 0.37890994910037923 - }, - "nextControl": { - "x": 7.885150331439394, - "y": 0.37890994910037923 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 6.760349158084754, - "y": 2.1424791740648677 - }, - "prevControl": { - "x": 7.332129276160038, - "y": 2.163277365944602 - }, - "nextControl": { - "x": 7.332129276160038, - "y": 2.163277365944602 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.495676676432291, - "y": 2.784432151100852 - }, - "prevControl": { - "x": 8.568560975970643, - "y": 2.603068033854167 - }, - "nextControl": { - "x": 8.568560975970643, - "y": 2.603068033854167 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 2.2568988222064394, - "y": 0.5056919907078594 - }, - "prevControl": { - "x": 1.0155882401899858, - "y": 0.4722983620383523 - }, - "nextControl": null, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - } - ], - "markers": [] -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/Shoot5RamTotes.path b/src/main/deploy/pathplanner/Shoot5RamTotes.path deleted file mode 100644 index a5a96b1..0000000 --- a/src/main/deploy/pathplanner/Shoot5RamTotes.path +++ /dev/null @@ -1,124 +0,0 @@ -{ - "waypoints": [ - { - "anchorPoint": { - "x": 1.038658494054952, - "y": 1.7231481783489349 - }, - "prevControl": null, - "nextControl": { - "x": 2.033283801180259, - "y": 1.7231481783489349 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 7.106496523796502, - "y": 1.8409702760138191 - }, - "prevControl": { - "x": 5.836130350416002, - "y": 1.013091196732145 - }, - "nextControl": { - "x": 8.417267360318341, - "y": 2.695180484084232 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": true, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 8.726550366688663, - "y": 5.3019943949198005 - }, - "prevControl": { - "x": 8.71182260448055, - "y": 4.094317893854734 - }, - "nextControl": { - "x": 8.71182260448055, - "y": 4.094317893854734 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 5.884092260523325, - "y": 2.4448085265463524 - }, - "prevControl": { - "x": 7.145372661318593, - "y": 3.1286352498690886 - }, - "nextControl": { - "x": 4.661687997250149, - "y": 1.7820592271813773 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": true, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 2.084329610830802, - "y": 0.5449272017000906 - }, - "prevControl": { - "x": 0.7882865365170725, - "y": 0.5154716772838693 - }, - "nextControl": null, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - } - ], - "markers": [] -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/ShootRamSide5Totes.path b/src/main/deploy/pathplanner/ShootRamSide5Totes.path deleted file mode 100644 index 6169dbe..0000000 --- a/src/main/deploy/pathplanner/ShootRamSide5Totes.path +++ /dev/null @@ -1,124 +0,0 @@ -{ - "waypoints": [ - { - "anchorPoint": { - "x": 0.7207225452769886, - "y": 1.9404944217566291 - }, - "prevControl": null, - "nextControl": { - "x": 1.7086549637491797, - "y": 1.9404944217566291 - }, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.619107333096592, - "y": 0.721403179746686 - }, - "prevControl": { - "x": 7.885150331439394, - "y": 0.37890994910037923 - }, - "nextControl": { - "x": 7.885150331439394, - "y": 0.37890994910037923 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 6.760349158084754, - "y": 2.1424791740648677 - }, - "prevControl": { - "x": 7.332129276160038, - "y": 2.163277365944602 - }, - "nextControl": { - "x": 7.332129276160038, - "y": 2.163277365944602 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 9.495676676432291, - "y": 2.784432151100852 - }, - "prevControl": { - "x": 8.568560975970643, - "y": 2.603068033854167 - }, - "nextControl": { - "x": 8.568560975970643, - "y": 2.603068033854167 - }, - "holonomicAngle": 0, - "isReversal": true, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - }, - { - "anchorPoint": { - "x": 2.2568988222064394, - "y": 0.5056919907078594 - }, - "prevControl": { - "x": 1.0155882401899858, - "y": 0.4722983620383523 - }, - "nextControl": null, - "holonomicAngle": 0, - "isReversal": false, - "velOverride": null, - "isLocked": false, - "isStopPoint": false, - "stopEvent": { - "names": [], - "executionBehavior": "parallel", - "waitBehavior": "none", - "waitTime": 0 - } - } - ], - "markers": [] -} \ No newline at end of file diff --git a/src/main/java/org/team1540/bunnybotTank2023/RobotContainer.java b/src/main/java/org/team1540/bunnybotTank2023/RobotContainer.java index a1f5864..9809bc6 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/RobotContainer.java +++ b/src/main/java/org/team1540/bunnybotTank2023/RobotContainer.java @@ -13,7 +13,6 @@ import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import org.littletonrobotics.junction.networktables.LoggedDashboardChooser; import org.team1540.bunnybotTank2023.commands.auto.*; -import org.team1540.bunnybotTank2023.commands.auto.utilSequences.AutoAimShoot5; import org.team1540.bunnybotTank2023.commands.drivetrain.ArcadeDriveCommand; import org.team1540.bunnybotTank2023.commands.drivetrain.Drivetrain; import org.team1540.bunnybotTank2023.commands.indexer.Indexer; @@ -131,10 +130,10 @@ private void initAutoChooser() { autoChooser.addDefaultOption("ZeroTurret", new TurretZeroSequenceCommand(turret)); autoChooser.addOption("DoNothing", new InstantCommand()); autoChooser.addOption("AutoTaxi", new AutoTaxi(drivetrain, turret)); - autoChooser.addOption("LeftSideRamTotes", new AutoLeftSideRamTotes(drivetrain, indexer, turret, shooter, limelight)); - autoChooser.addOption("RightSideRamTotes", new AutoRightSideRamTotes(drivetrain, indexer, turret, shooter, limelight)); - autoChooser.addOption("LeftSideRamSinusoid", new AutoLeftSideRamSinusoid(drivetrain, indexer, turret, shooter, limelight)); - autoChooser.addOption("RightSideRamSinusoid", new AutoRightSideRamSinusoid(drivetrain, indexer, turret, shooter, limelight)); + autoChooser.addOption("LeftSideRamTotes", new AutoLeftSideRamTotes(drivetrain, turret)); + autoChooser.addOption("RightSideRamTotes", new AutoRightSideRamTotes(drivetrain, turret)); + autoChooser.addOption("LeftSideRamSinusoid", new AutoLeftSideRamSinusoid(drivetrain, turret)); + autoChooser.addOption("RightSideRamSinusoid", new AutoRightSideRamSinusoid(drivetrain, turret)); autoChooser.addOption("TaxiShoot5", new AutoTaxiShoot5(drivetrain, indexer, turret, shooter, limelight)); } diff --git a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamSinusoid.java b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamSinusoid.java index 4587728..28ed75b 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamSinusoid.java +++ b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamSinusoid.java @@ -3,21 +3,15 @@ import com.pathplanner.lib.PathConstraints; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import org.team1540.bunnybotTank2023.commands.auto.utilSequences.AutoAimShoot5; import org.team1540.bunnybotTank2023.commands.drivetrain.Drivetrain; -import org.team1540.bunnybotTank2023.commands.indexer.IndexerIdleCommand; import org.team1540.bunnybotTank2023.commands.turret.Turret; -import org.team1540.bunnybotTank2023.commands.indexer.Indexer; -import org.team1540.bunnybotTank2023.commands.shooter.Shooter; - import org.team1540.bunnybotTank2023.commands.turret.TurretZeroSequenceCommand; -import org.team1540.bunnybotTank2023.io.vision.Limelight; import org.team1540.bunnybotTank2023.utils.AutoCommand; import java.util.List; public class AutoLeftSideRamSinusoid extends AutoCommand { - public AutoLeftSideRamSinusoid(Drivetrain drivetrain, Indexer indexer, Turret turret, Shooter shooter, Limelight limelight) { + public AutoLeftSideRamSinusoid(Drivetrain drivetrain, Turret turret) { List pathCommands = getPathPlannerDriveCommandGroup( drivetrain, "LeftSideRamSinusoid", diff --git a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamTotes.java b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamTotes.java index 70febd1..570f466 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamTotes.java +++ b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoLeftSideRamTotes.java @@ -3,19 +3,15 @@ import com.pathplanner.lib.PathConstraints; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import org.team1540.bunnybotTank2023.commands.auto.utilSequences.AutoAimShoot5; import org.team1540.bunnybotTank2023.commands.drivetrain.Drivetrain; -import org.team1540.bunnybotTank2023.commands.indexer.Indexer; -import org.team1540.bunnybotTank2023.commands.shooter.Shooter; import org.team1540.bunnybotTank2023.commands.turret.Turret; import org.team1540.bunnybotTank2023.commands.turret.TurretZeroSequenceCommand; -import org.team1540.bunnybotTank2023.io.vision.Limelight; import org.team1540.bunnybotTank2023.utils.AutoCommand; import java.util.List; public class AutoLeftSideRamTotes extends AutoCommand { - public AutoLeftSideRamTotes(Drivetrain drivetrain, Indexer indexer, Turret turret, Shooter shooter, Limelight limelight) { + public AutoLeftSideRamTotes(Drivetrain drivetrain, Turret turret) { List pathCommands = getPathPlannerDriveCommandGroup( drivetrain, "LeftSideRamTotes", diff --git a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamSinusoid.java b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamSinusoid.java index f497cd6..a0b875b 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamSinusoid.java +++ b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamSinusoid.java @@ -3,21 +3,15 @@ import com.pathplanner.lib.PathConstraints; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import org.team1540.bunnybotTank2023.commands.auto.utilSequences.AutoAimShoot5; import org.team1540.bunnybotTank2023.commands.drivetrain.Drivetrain; -import org.team1540.bunnybotTank2023.commands.indexer.IndexerIdleCommand; import org.team1540.bunnybotTank2023.commands.turret.Turret; -import org.team1540.bunnybotTank2023.commands.indexer.Indexer; -import org.team1540.bunnybotTank2023.commands.shooter.Shooter; - import org.team1540.bunnybotTank2023.commands.turret.TurretZeroSequenceCommand; -import org.team1540.bunnybotTank2023.io.vision.Limelight; import org.team1540.bunnybotTank2023.utils.AutoCommand; import java.util.List; public class AutoRightSideRamSinusoid extends AutoCommand { - public AutoRightSideRamSinusoid(Drivetrain drivetrain, Indexer indexer, Turret turret, Shooter shooter, Limelight limelight) { + public AutoRightSideRamSinusoid(Drivetrain drivetrain, Turret turret) { List pathCommands = getPathPlannerDriveCommandGroup( drivetrain, "RightSideRamSinusoid", diff --git a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamTotes.java b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamTotes.java index 6760b9c..34111ff 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamTotes.java +++ b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoRightSideRamTotes.java @@ -3,19 +3,15 @@ import com.pathplanner.lib.PathConstraints; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import org.team1540.bunnybotTank2023.commands.auto.utilSequences.AutoAimShoot5; import org.team1540.bunnybotTank2023.commands.drivetrain.Drivetrain; -import org.team1540.bunnybotTank2023.commands.indexer.Indexer; -import org.team1540.bunnybotTank2023.commands.shooter.Shooter; import org.team1540.bunnybotTank2023.commands.turret.Turret; import org.team1540.bunnybotTank2023.commands.turret.TurretZeroSequenceCommand; -import org.team1540.bunnybotTank2023.io.vision.Limelight; import org.team1540.bunnybotTank2023.utils.AutoCommand; import java.util.List; public class AutoRightSideRamTotes extends AutoCommand { - public AutoRightSideRamTotes(Drivetrain drivetrain, Indexer indexer, Turret turret, Shooter shooter, Limelight limelight) { + public AutoRightSideRamTotes(Drivetrain drivetrain, Turret turret) { List pathCommands = getPathPlannerDriveCommandGroup( drivetrain, "RightSideRamTotes", diff --git a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxi.java b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxi.java index 488dbc4..0b2d39b 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxi.java +++ b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxi.java @@ -19,7 +19,6 @@ public AutoTaxi(Drivetrain drivetrain, Turret turret) { true ); - addRequirements(drivetrain); addCommands( Commands.parallel( pathCommands.get(0), diff --git a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxiShoot5.java b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxiShoot5.java index fcffc73..2379059 100644 --- a/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxiShoot5.java +++ b/src/main/java/org/team1540/bunnybotTank2023/commands/auto/AutoTaxiShoot5.java @@ -3,11 +3,9 @@ import com.pathplanner.lib.PathConstraints; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import edu.wpi.first.wpilibj2.command.PrintCommand; import org.team1540.bunnybotTank2023.commands.auto.utilSequences.AutoAimShoot5; import org.team1540.bunnybotTank2023.commands.drivetrain.Drivetrain; import org.team1540.bunnybotTank2023.commands.indexer.Indexer; -import org.team1540.bunnybotTank2023.commands.indexer.IndexerIdleCommand; import org.team1540.bunnybotTank2023.commands.shooter.Shooter; import org.team1540.bunnybotTank2023.commands.turret.Turret; import org.team1540.bunnybotTank2023.commands.turret.TurretZeroSequenceCommand; @@ -28,7 +26,8 @@ public AutoTaxiShoot5(Drivetrain drivetrain, Indexer indexer, Turret turret, Sho Commands.parallel( pathCommands.get(0), new TurretZeroSequenceCommand(turret).asProxy() - ) + ), + new AutoAimShoot5(turret, shooter, indexer, limelight) ); } }