From: Kevin Zhang Date: Wed, 17 Feb 2016 19:06:34 +0000 (-0800) Subject: Delete gyro stuff in robot it's already in drivetrain X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=fc2f06d4080456fcac3e3a8411805776894dd790 Delete gyro stuff in robot it's already in drivetrain --- diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 90584412..99f66213 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -1,7 +1,6 @@ package org.usfirst.frc.team3501.robot; import org.usfirst.frc.team3501.robot.Constants.Defense; -import org.usfirst.frc.team3501.robot.sensors.GyroLib; import org.usfirst.frc.team3501.robot.sensors.Photogate; import org.usfirst.frc.team3501.robot.subsystems.DefenseArm; import org.usfirst.frc.team3501.robot.subsystems.DriveTrain; @@ -9,7 +8,6 @@ import org.usfirst.frc.team3501.robot.subsystems.IntakeArm; import org.usfirst.frc.team3501.robot.subsystems.Scaler; import org.usfirst.frc.team3501.robot.subsystems.Shooter; -import edu.wpi.first.wpilibj.I2C; import edu.wpi.first.wpilibj.IterativeRobot; import edu.wpi.first.wpilibj.command.Scheduler; import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; @@ -30,16 +28,12 @@ public class Robot extends IterativeRobot { // Sendable Choosers send a drop down menu to the Smart Dashboard. SendableChooser positionChooser; SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense, - positionFourDefense, positionFiveDefense; - - // Gyro stuff - public GyroLib gyro; + positionFourDefense, positionFiveDefense; @Override public void robotInit() { driveTrain = new DriveTrain(); oi = new OI(); - gyro = new GyroLib(I2C.Port.kOnboard, false); shooter = new Shooter(); scaler = new Scaler(); @@ -138,17 +132,11 @@ public class Robot extends IterativeRobot { @Override public void teleopInit() { - - gyro.start(); - } @Override public void teleopPeriodic() { Scheduler.getInstance().run(); - - System.out.println("Degrees: " + gyro.getRotationZ().getAngle()); - } }