Merge remote-tracking branch 'refs/remotes/origin/main'

absozero · absozero · commit fafb903f2d92 · 2024-07-21T21:36:35.000-07:00
diff --git a/include/robot/auton.h b/include/robot/auton.h
@@ -83,6 +83,5 @@ namespace Robot {
 
         void Auton5(Intake &intake, Latch &latch);
 
-        
     };
 }
diff --git a/src/routines/auton.cpp b/src/routines/auton.cpp
@@ -127,9 +127,9 @@ void Autonomous::AutoDrive(Intake &intake, Latch &latch) {
         Auton4(intake, latch);
     }
 
-	if(Autonomous::auton == 5){
-        Auton5(intake, latch);
-    }
+	if(Autonomous::auton == 5) {
+		Auton5(intake, latch)
+	}
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,5 @@ namespace Robot {`
`83`	`83`
`84`	`84`	`void Auton5(Intake &intake, Latch &latch);`
`85`	`85`
`86`		`-`
`87`	`86`	`};`
`88`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,9 @@ void Autonomous::AutoDrive(Intake &intake, Latch &latch) {`
`127`	`127`	`Auton4(intake, latch);`
`128`	`128`	`}`
`129`	`129`
`130`		`- if(Autonomous::auton == 5){`
`131`		`- Auton5(intake, latch);`
`132`		`- }`
	`130`	`+ if(Autonomous::auton == 5) {`
	`131`	`+ Auton5(intake, latch)`
	`132`	`+ }`
`133`	`133`
`134`	`134`	`}`
`135`	`135`