From b249f8f6904372c9c10ff2d1e1f0faab808786ba Mon Sep 17 00:00:00 2001
From: aarav18 <aaravshah18@gmail.com>
Date: Mon, 28 Feb 2022 19:47:47 -0700
Subject: [PATCH] ALL POST-MERGE ERRORS FIXED

---
 src/main/java/frc4388/robot/commands/AimToCenter.java        | 2 +-
 src/test/java/frc4388/robot/subsystems/LEDSubsystemTest.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/frc4388/robot/commands/AimToCenter.java b/src/main/java/frc4388/robot/commands/AimToCenter.java
index 70e65f3..45f0998 100644
--- a/src/main/java/frc4388/robot/commands/AimToCenter.java
+++ b/src/main/java/frc4388/robot/commands/AimToCenter.java
@@ -38,7 +38,7 @@ public class AimToCenter extends CommandBase {
   // Called every time the scheduler runs while the command is scheduled.
   @Override
   public void execute() {
-    m_targetAngle = angleToCenter(x, y, m_drive.gyro.getAngle());
+    m_targetAngle = angleToCenter(x, y, m_drive.getRegGyro().getDegrees());
     m_turret.runshooterRotatePID(m_targetAngle);
   }
 
diff --git a/src/test/java/frc4388/robot/subsystems/LEDSubsystemTest.java b/src/test/java/frc4388/robot/subsystems/LEDSubsystemTest.java
index 9fe8f58..a0f6b97 100644
--- a/src/test/java/frc4388/robot/subsystems/LEDSubsystemTest.java
+++ b/src/test/java/frc4388/robot/subsystems/LEDSubsystemTest.java
@@ -6,6 +6,7 @@ package frc4388.robot.subsystems;
 
 import static org.junit.Assert.assertEquals;
 // import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mock;
 
 import org.junit.Test;