From e2aa014323af0ab29ffa978bea8dc5b845ac7fa1 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 21 Feb 2024 19:18:57 -0500 Subject: [PATCH] --- src/main/deploy/pathplanner/autos/B.C.2.auto | 2 +- src/main/deploy/pathplanner/autos/B.C.3.auto | 2 +- src/main/deploy/pathplanner/autos/B.C.4.auto | 2 +- src/main/deploy/pathplanner/autos/B.C.5.auto | 2 +- src/main/deploy/pathplanner/autos/B.D.2.auto | 2 +- src/main/deploy/pathplanner/autos/B.D.3.auto | 2 +- src/main/deploy/pathplanner/autos/B.D.4.auto | 2 +- src/main/deploy/pathplanner/autos/B.D.5.auto | 2 +- src/main/deploy/pathplanner/autos/B.H.2.auto | 2 +- src/main/deploy/pathplanner/autos/B.H.3.auto | 2 +- src/main/deploy/pathplanner/autos/B.H.4.auto | 2 +- src/main/deploy/pathplanner/autos/B.H.5.auto | 2 +- src/main/deploy/pathplanner/autos/R.C.2.auto | 2 +- src/main/deploy/pathplanner/autos/R.C.3.auto | 2 +- src/main/deploy/pathplanner/autos/R.C.4.auto | 2 +- src/main/deploy/pathplanner/autos/R.C.5.auto | 2 +- src/main/deploy/pathplanner/autos/R.D.2.auto | 2 +- src/main/deploy/pathplanner/autos/R.D.3.auto | 2 +- src/main/deploy/pathplanner/autos/R.D.4.auto | 2 +- src/main/deploy/pathplanner/autos/R.D.5.auto | 2 +- src/main/deploy/pathplanner/autos/R.H.2.auto | 2 +- src/main/deploy/pathplanner/autos/R.H.3.auto | 2 +- src/main/deploy/pathplanner/autos/R.H.4.auto | 2 +- src/main/deploy/pathplanner/autos/R.H.5.auto | 2 +- src/main/deploy/pathplanner/autos/test.auto | 2 +- src/main/java/frc/robot/RobotContainer.java | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/B.C.2.auto b/src/main/deploy/pathplanner/autos/B.C.2.auto index 2ea7e6b..361dcce 100644 --- a/src/main/deploy/pathplanner/autos/B.C.2.auto +++ b/src/main/deploy/pathplanner/autos/B.C.2.auto @@ -5,7 +5,7 @@ "x": 1.3, "y": 5.55 }, - "rotation": 0.0 + "rotation": 90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.C.3.auto b/src/main/deploy/pathplanner/autos/B.C.3.auto index d56a1aa..2cb43c3 100644 --- a/src/main/deploy/pathplanner/autos/B.C.3.auto +++ b/src/main/deploy/pathplanner/autos/B.C.3.auto @@ -5,7 +5,7 @@ "x": 1.3, "y": 5.55 }, - "rotation": 180.0 + "rotation": 90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.C.4.auto b/src/main/deploy/pathplanner/autos/B.C.4.auto index 2f8fba6..091ef6c 100644 --- a/src/main/deploy/pathplanner/autos/B.C.4.auto +++ b/src/main/deploy/pathplanner/autos/B.C.4.auto @@ -5,7 +5,7 @@ "x": 1.3, "y": 5.55 }, - "rotation": 180.0 + "rotation": 90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.C.5.auto b/src/main/deploy/pathplanner/autos/B.C.5.auto index d5093f1..4cd6ae7 100644 --- a/src/main/deploy/pathplanner/autos/B.C.5.auto +++ b/src/main/deploy/pathplanner/autos/B.C.5.auto @@ -5,7 +5,7 @@ "x": 1.3, "y": 5.55 }, - "rotation": 180.0 + "rotation": 90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.D.2.auto b/src/main/deploy/pathplanner/autos/B.D.2.auto index d225767..5fc8939 100644 --- a/src/main/deploy/pathplanner/autos/B.D.2.auto +++ b/src/main/deploy/pathplanner/autos/B.D.2.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 4.4 }, - "rotation": 120.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.D.3.auto b/src/main/deploy/pathplanner/autos/B.D.3.auto index 4a43031..ff70e4d 100644 --- a/src/main/deploy/pathplanner/autos/B.D.3.auto +++ b/src/main/deploy/pathplanner/autos/B.D.3.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 4.4 }, - "rotation": 120.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.D.4.auto b/src/main/deploy/pathplanner/autos/B.D.4.auto index 1f2f761..a1f56c3 100644 --- a/src/main/deploy/pathplanner/autos/B.D.4.auto +++ b/src/main/deploy/pathplanner/autos/B.D.4.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 4.4 }, - "rotation": 120.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.D.5.auto b/src/main/deploy/pathplanner/autos/B.D.5.auto index d6a5e2d..104b760 100644 --- a/src/main/deploy/pathplanner/autos/B.D.5.auto +++ b/src/main/deploy/pathplanner/autos/B.D.5.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 4.4 }, - "rotation": 120.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.H.2.auto b/src/main/deploy/pathplanner/autos/B.H.2.auto index 4719e02..6233067 100644 --- a/src/main/deploy/pathplanner/autos/B.H.2.auto +++ b/src/main/deploy/pathplanner/autos/B.H.2.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 6.7 }, - "rotation": -120.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.H.3.auto b/src/main/deploy/pathplanner/autos/B.H.3.auto index 6c5a86c..c07d4dd 100644 --- a/src/main/deploy/pathplanner/autos/B.H.3.auto +++ b/src/main/deploy/pathplanner/autos/B.H.3.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 6.7 }, - "rotation": -120.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.H.4.auto b/src/main/deploy/pathplanner/autos/B.H.4.auto index 28c6ece..6b2d529 100644 --- a/src/main/deploy/pathplanner/autos/B.H.4.auto +++ b/src/main/deploy/pathplanner/autos/B.H.4.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 6.7 }, - "rotation": -120.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/B.H.5.auto b/src/main/deploy/pathplanner/autos/B.H.5.auto index 0771143..4a467b0 100644 --- a/src/main/deploy/pathplanner/autos/B.H.5.auto +++ b/src/main/deploy/pathplanner/autos/B.H.5.auto @@ -5,7 +5,7 @@ "x": 0.7, "y": 6.7 }, - "rotation": -120.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.C.2.auto b/src/main/deploy/pathplanner/autos/R.C.2.auto index d3b211f..b017903 100644 --- a/src/main/deploy/pathplanner/autos/R.C.2.auto +++ b/src/main/deploy/pathplanner/autos/R.C.2.auto @@ -5,7 +5,7 @@ "x": 15.2, "y": 5.55 }, - "rotation": 180.0 + "rotation": -90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.C.3.auto b/src/main/deploy/pathplanner/autos/R.C.3.auto index 9dcd3f2..60da2cd 100644 --- a/src/main/deploy/pathplanner/autos/R.C.3.auto +++ b/src/main/deploy/pathplanner/autos/R.C.3.auto @@ -5,7 +5,7 @@ "x": 15.2, "y": 5.55 }, - "rotation": 0 + "rotation": -90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.C.4.auto b/src/main/deploy/pathplanner/autos/R.C.4.auto index a02d8ff..ec9facb 100644 --- a/src/main/deploy/pathplanner/autos/R.C.4.auto +++ b/src/main/deploy/pathplanner/autos/R.C.4.auto @@ -5,7 +5,7 @@ "x": 15.2, "y": 5.55 }, - "rotation": 0 + "rotation": -90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.C.5.auto b/src/main/deploy/pathplanner/autos/R.C.5.auto index da66759..bba0960 100644 --- a/src/main/deploy/pathplanner/autos/R.C.5.auto +++ b/src/main/deploy/pathplanner/autos/R.C.5.auto @@ -5,7 +5,7 @@ "x": 15.2, "y": 5.55 }, - "rotation": 0 + "rotation": -90.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.D.2.auto b/src/main/deploy/pathplanner/autos/R.D.2.auto index fbbd903..05155eb 100644 --- a/src/main/deploy/pathplanner/autos/R.D.2.auto +++ b/src/main/deploy/pathplanner/autos/R.D.2.auto @@ -5,7 +5,7 @@ "x": 15.85, "y": 4.4 }, - "rotation": 60.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.D.3.auto b/src/main/deploy/pathplanner/autos/R.D.3.auto index cec92fd..8482fde 100644 --- a/src/main/deploy/pathplanner/autos/R.D.3.auto +++ b/src/main/deploy/pathplanner/autos/R.D.3.auto @@ -5,7 +5,7 @@ "x": 15.85, "y": 4.4 }, - "rotation": 60.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.D.4.auto b/src/main/deploy/pathplanner/autos/R.D.4.auto index f43c6b0..868598c 100644 --- a/src/main/deploy/pathplanner/autos/R.D.4.auto +++ b/src/main/deploy/pathplanner/autos/R.D.4.auto @@ -5,7 +5,7 @@ "x": 15.85, "y": 4.4 }, - "rotation": 60.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.D.5.auto b/src/main/deploy/pathplanner/autos/R.D.5.auto index 615fb4e..a6aa7d1 100644 --- a/src/main/deploy/pathplanner/autos/R.D.5.auto +++ b/src/main/deploy/pathplanner/autos/R.D.5.auto @@ -5,7 +5,7 @@ "x": 15.85, "y": 4.4 }, - "rotation": 60.0 + "rotation": -30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.H.2.auto b/src/main/deploy/pathplanner/autos/R.H.2.auto index b354106..0c48ad9 100644 --- a/src/main/deploy/pathplanner/autos/R.H.2.auto +++ b/src/main/deploy/pathplanner/autos/R.H.2.auto @@ -5,7 +5,7 @@ "x": 15.8, "y": 6.65 }, - "rotation": -60.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.H.3.auto b/src/main/deploy/pathplanner/autos/R.H.3.auto index 051db29..d61ffee 100644 --- a/src/main/deploy/pathplanner/autos/R.H.3.auto +++ b/src/main/deploy/pathplanner/autos/R.H.3.auto @@ -5,7 +5,7 @@ "x": 15.8, "y": 6.65 }, - "rotation": -60.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.H.4.auto b/src/main/deploy/pathplanner/autos/R.H.4.auto index f58efd3..81dab92 100644 --- a/src/main/deploy/pathplanner/autos/R.H.4.auto +++ b/src/main/deploy/pathplanner/autos/R.H.4.auto @@ -5,7 +5,7 @@ "x": 15.8, "y": 6.65 }, - "rotation": -60.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/R.H.5.auto b/src/main/deploy/pathplanner/autos/R.H.5.auto index cc8132b..e6e24f1 100644 --- a/src/main/deploy/pathplanner/autos/R.H.5.auto +++ b/src/main/deploy/pathplanner/autos/R.H.5.auto @@ -5,7 +5,7 @@ "x": 15.8, "y": 6.65 }, - "rotation": -60.0 + "rotation": 30.0 }, "command": { "type": "sequential", diff --git a/src/main/deploy/pathplanner/autos/test.auto b/src/main/deploy/pathplanner/autos/test.auto index 8333c11..e50e0a3 100644 --- a/src/main/deploy/pathplanner/autos/test.auto +++ b/src/main/deploy/pathplanner/autos/test.auto @@ -39,6 +39,6 @@ ] } }, - "folder": "4", + "folder": null, "choreoAuto": false } \ 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 7f0fb83..e416f41 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -89,7 +89,7 @@ public class RobotContainer { joystick.button(1).whileTrue(new LancerNote(lanceur, accumulateur)); joystick.button(5).whileTrue(new LancerAmp(lanceur, accumulateur)); joystick.button(4).whileTrue(new ParallelCommandGroup(new Lancer(lanceur,limelight),new Limelight_tracker(limelight,drive))); - joystick.button(2).whileTrue(new ParallelCommandGroup(new Lancerampli(lanceur,limelight),new Limelight_tracker(limelight,drive),new GuiderHaut(guideur))); + joystick.button(2).whileTrue(new ParallelCommandGroup(new Lancerampli(lanceur,limelight),new Limelight_tracker(limelight,drive))); // deplacement configureBindings();