merge conflict nation rise up

robototes · Mar 19, 2024 · e23c881 · e23c881
1 parent 2f60eb9
commit e23c881
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...os/TopSpeakerCenterlineN1N2Autoline1.auto → ...s/TopSpeakerCenterlineN1N2AutolineN1.auto b/...os/TopSpeakerCenterlineN1N2Autoline1.auto → ...s/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
@@ -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(){}