[#101] Merged Main + basic formating

frc-862 · Jan 26, 2024 · 7cfaa35 · 7cfaa35
1 parent ba433f0
commit 7cfaa35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/src/main/java/frc/robot/command/PointAtTag.java b/src/main/java/frc/robot/command/PointAtTag.java
@@ -48,7 +48,6 @@ public PointAtTag(Swerve drivetrain, XboxController driver, String limelight_nam
 		this.driver = driver;
 		this.useLimelights = useLimelights;
 
-
 		//TODO Figure out which of these is the right one to use 
 		for (var l : drivetrain.getLimelights()) { 
 		 	if (l.getName().equals(limelight_name)) {
@@ -79,15 +78,11 @@ public void initialize() {
 	@Override
 	public void execute() {
 		if (useLimelights) {
-
 			targetHeading = limelight.getTargetX();
-
 		} else {
-
 			lockedOnHeading = LightningShuffleboard.getDouble("PointAtTag", "LockOnHeading", 0);
 			LightningShuffleboard.setDouble("PointAtTag", "Drivetrain Angle", drivetrain.getPigeon2().getAngle());
 			targetHeading = lockedOnHeading - drivetrain.getPigeon2().getAngle();
-
 		}
 
 		lockedOnHeading = LightningShuffleboard.getDouble("PointAtTag", "LockOnHeading", 0);

diff --git a/src/main/java/frc/robot/subsystems/Collision.java b/src/main/java/frc/robot/subsystems/Collision.java
diff --git a/src/main/java/frc/thunder b/src/main/java/frc/thunder