From e23c881fc2df5d1061ed30f44ac623aae12d59b7 Mon Sep 17 00:00:00 2001 From: kirby Date: Mon, 18 Mar 2024 19:45:24 -0700 Subject: [PATCH] merge conflict nation rise up --- ...line1.auto => TopSpeakerCenterlineN1N2AutolineN1.auto} | 0 src/main/java/frc/team2412/robot/util/auto/AutoLogic.java | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename src/main/deploy/pathplanner/autos/{TopSpeakerCenterlineN1N2Autoline1.auto => TopSpeakerCenterlineN1N2AutolineN1.auto} (100%) diff --git a/src/main/deploy/pathplanner/autos/TopSpeakerCenterlineN1N2Autoline1.auto b/src/main/deploy/pathplanner/autos/TopSpeakerCenterlineN1N2AutolineN1.auto similarity index 100% rename from src/main/deploy/pathplanner/autos/TopSpeakerCenterlineN1N2Autoline1.auto rename to src/main/deploy/pathplanner/autos/TopSpeakerCenterlineN1N2AutolineN1.auto diff --git a/src/main/java/frc/team2412/robot/util/auto/AutoLogic.java b/src/main/java/frc/team2412/robot/util/auto/AutoLogic.java index ed62641a..47a0a1ba 100644 --- a/src/main/java/frc/team2412/robot/util/auto/AutoLogic.java +++ b/src/main/java/frc/team2412/robot/util/auto/AutoLogic.java @@ -183,13 +183,15 @@ public static void registerCommands() { // Complex Autos NamedCommands.registerCommand("AutoLogicTest", ComplexAutoPaths.testAuto); NamedCommands.registerCommand( - "MidSpeakerCenterLineN5N4N3", ComplexAutoPaths.midSpeakerCenterLineN3N2N1); + "MidSpeakerCenterLineN3N2N1", ComplexAutoPaths.midSpeakerCenterLineN3N2N1); NamedCommands.registerCommand( "LowSpeakerCenterLineN5N4N3", ComplexAutoPaths.lowSpeakerCenterLineN5N4N3); NamedCommands.registerCommand( - "TopSpeakerCenterLineN1N2AutoLine1", ComplexAutoPaths.TopSpeakerCenterLineN1N2AutoLineN1); + "LowSpeakerCenterLineN5N4", ComplexAutoPaths.lowSpeakerCenterLineN5N4); NamedCommands.registerCommand( - "TopSpeakerCenterLineN1N2AutoLine1", ComplexAutoPaths.TopSpeakerCenterLineN1N2N3); + "TopSpeakerCenterLineN1N2AutoLineN1", ComplexAutoPaths.TopSpeakerCenterLineN1N2AutoLineN1); + NamedCommands.registerCommand( + "TopSpeakerCenterLineN1N2N3", ComplexAutoPaths.TopSpeakerCenterLineN1N2N3); } // public Command getConditionalCommand(){}