new auto, remap

diff --git a/src/main/deploy/pathplanner/paths/Swipe1.path b/src/main/deploy/pathplanner/paths/Swipe1.path
index 033d22c584077d48bd53c167534d0b0fe5bfb3e3..09d78667f45d2179a5057622ce77f9558351439c 100644 (file)
--- a/src/main/deploy/pathplanner/paths/Swipe1.path
+++ b/src/main/deploy/pathplanner/paths/Swipe1.path
@@ -164,5 +164,5 @@
     "velocity": 0.5,
     "rotation": 0.0
   },
-  "useDefaultConstraints": false
+  "useDefaultConstraints": true
 }
\ No newline at end of file

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 36abc1cb58f5a41a56ef0db62c1773cddf25dbe0..ee132d97ce148737523feadc64912ce6c67e0f7d 100644 (file)
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -283,6 +283,7 @@ public class RobotContainer {
     String rightSideAuto = "Right Week V1";
     String shootOnlyAuto = "Shoot Only Left Week V1";
     String leftLiberalSwipe = "LeftLiberalDoubleSwipe";
+    String rightLiberalSwipe = "RightLiberalDoubleSwipe";
     String leftLiberalSwipeTranslation = "LeftLiberalDoubleSwipeTranslation";
     String leftConservativeSwipe = "LeftConservativeDoubleSwipe";
 
@@ -292,8 +293,10 @@ public class RobotContainer {
     addAuto(shootOnlyAuto);
     addAuto(leftConservativeSwipe);
     addAuto(leftLiberalSwipe);
+    addAuto(rightLiberalSwipe);
     addAuto(leftLiberalSwipeTranslation);
 
+
     // put the Chooser on the SmartDashboard
     SmartDashboard.putData("Auto chooser", autoChooser);
   }

diff --git a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index ae091303b0880dbd41070ef55fb12b242c99427e..3c13ed9167446c811d0a4c9f08a967df9772d248 100644 (file)
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@ -174,11 +174,11 @@ public class PS5ControllerDriverConfig extends BaseDriverConfig {
 
         // shooter power modifier
         if (shooter != null) {
-            controller.get(PS5Button.PS).onTrue(new InstantCommand(() -> {
+            controller.get(PS5Button.TRIANGLE).onTrue(new InstantCommand(() -> {
                 double current = SmartDashboard.getNumber("OPERATOR: Shooter Power Modifier", 1.05);
                 SmartDashboard.putNumber("OPERATOR: Shooter Power Modifier", current + 0.05);
             }));
-            controller.get(PS5Button.TRIANGLE).onTrue(new InstantCommand(() -> {
+            controller.get(PS5Button.CROSS).onTrue(new InstantCommand(() -> {
                 double current = SmartDashboard.getNumber("OPERATOR: Shooter Power Modifier", 1.05);
                 SmartDashboard.putNumber("OPERATOR: Shooter Power Modifier", Math.max(0.5, current - 0.05));
             }));