Merge Hotfix #1

Fixed compile time bugs in Drivetrain
SummitRobotics · Jan 14, 2019 · 44fd1fd · 44fd1fd
1 parent d4b722d
commit 44fd1fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/frc/robot/subsystems/Drivetrain.java b/src/main/java/frc/robot/subsystems/Drivetrain.java
@@ -135,7 +135,7 @@ public double getPigeonYaw() {
         return ypr[0];
     }
 
-    public static void resetGyro2(){
+    public void resetGyro2(){
         gyro2.setYaw(0);
         gyro2.setAccumZAngle(0);
         gyro2.enterCalibrationMode(PigeonIMU.CalibrationMode.BootTareGyroAccel);

diff --git a/src/main/java/frc/robot/teleop/Teleop_Arcade_Differential.java b/src/main/java/frc/robot/teleop/Teleop_Arcade_Differential.java
@@ -27,6 +27,6 @@ public void run(){
         SmartDashboard.putNumber("Right Encoder", subsystems.drivetrain.getRightEncoderPos());
         SmartDashboard.putNumber("Left Velocity", subsystems.drivetrain.getLeftEncoderVel());
         SmartDashboard.putNumber("Right Velocity", subsystems.drivetrain.getRightEncoderVel());
-
+    
     }
 }