[#29] fix erroring autons

frc-862 · Mar 9, 2024 · 137aa48 · 137aa48
1 parent 2b3cdea
commit 137aa48
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 85 deletions.
diff --git a/src/main/deploy/pathplanner/autos/1-BF-Mobility.auto b/src/main/deploy/pathplanner/autos/1-BF-Mobility.auto
diff --git a/src/main/deploy/pathplanner/paths/BL-F5.path b/src/main/deploy/pathplanner/paths/BL-F5.path
@@ -3,44 +3,25 @@
   "waypoints": [
     {
       "anchor": {
-<<<<<<<< HEAD:src/main/deploy/pathplanner/paths/Amp autoalign.path
         "x": 1.85,
         "y": 6.5
       },
       "prevControl": null,
       "nextControl": {
         "x": 1.85,
         "y": 6.550000000000001
-========
-        "x": 5.85285555186495,
-        "y": 1.1445653660538107
-      },
-      "prevControl": null,
-      "nextControl": {
-        "x": 6.94693201083977,
-        "y": 1.0773969622118975
->>>>>>>> main:src/main/deploy/pathplanner/paths/BL-F5.path
       },
       "isLocked": false,
       "linkedName": "BottomLine"
     },
     {
       "anchor": {
-<<<<<<<< HEAD:src/main/deploy/pathplanner/paths/Amp autoalign.path
         "x": 1.85,
         "y": 7.5
       },
       "prevControl": {
         "x": 1.85,
         "y": 7.45
-========
-        "x": 8.293678213604645,
-        "y": 0.77
-      },
-      "prevControl": {
-        "x": 6.94693201083977,
-        "y": 1.0305536160287727
->>>>>>>> main:src/main/deploy/pathplanner/paths/BL-F5.path
       },
       "nextControl": null,
       "isLocked": false,

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -182,9 +182,9 @@ protected void configureButtonBindings() {
 		// new Trigger(driver::getXButton).whileTrue(new InstantCommand(() -> drivetrain.brake()));
 
 		// smart shoot for the robot
-		new Trigger(driver::getAButton)
-			.whileTrue(new SmartShoot(flywheel, pivot, drivetrain, indexer, leds)
-			.deadlineWith(leds.enableState(LED_STATES.SHOOTING)));
+		// new Trigger(driver::getAButton)
+		// 	.whileTrue(new SmartShoot(flywheel, pivot, drivetrain, indexer, leds)
+		// 	.deadlineWith(leds.enableState(LED_STATES.SHOOTING)));
 
 		// aim at amp and stage tags for the robot
 		new Trigger(driver::getXButton)