Add Hall Effect Sensor code to test sensor

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 908a52dcf0339b44735147d174f069500b873280..6d1094c641ad98d7c42147e69f507e5bcb5bb64e 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,12 +1,9 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<< HEAD
-=======
-import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
->>>>>>> fix bugs
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
+import org.usfirst.frc.team3501.robot.utils.HallEffectSensor;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
@@ -16,6 +13,7 @@ public class Robot extends IterativeRobot {
   private static Shooter shooter;
   private static OI oi;
   private static Intake intake;
+  private HallEffectSensor hallEffect;
 
   @Override
   public void robotInit() {
@@ -23,6 +21,8 @@ public class Robot extends IterativeRobot {
     oi = OI.getOI();
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
+
+    hallEffect = Shooter.getHallEffectSensor();
   }
 
   public static DriveTrain getDriveTrain() {
@@ -41,12 +41,11 @@ public class Robot extends IterativeRobot {
     return Intake.getIntake();
   }
 
+  // If the gear values do not match in the left and right piston, then they are
+  // both set to high gear
   @Override
   public void autonomousInit() {
-<<<<<<< HEAD
-=======
-    Scheduler.getInstance().add(new DriveDistance(25, 10));
->>>>>>> fix bugs
+    driveTrain.setHighGear();
   }
 
   @Override
@@ -57,11 +56,12 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
+    System.out.println("Hall Effect Period: " + hallEffect.getCounterPeriod());
   }
 }