Update ports to competition setup, minor bugfixes

[3501/stronghold-2016] / 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 79e12d9e00d8adc2adeb8be51b8fd97fa8978459..8616cfa765dd39fe98e3f3eeb42c6f3534c45b13 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,10 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.Constants.DriveTrain;
+import org.usfirst.frc.team3501.robot.commands.driving.SetHighGear;
+import org.usfirst.frc.team3501.robot.commands.intakearm.MoveIntakeArm;
+import org.usfirst.frc.team3501.robot.commands.shooter.ResetCatapult;
+import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
+import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
@@ -10,12 +14,15 @@ public class Robot extends IterativeRobot {
   public static OI oi;
   public static DriveTrain driveTrain;
   public static Shooter shooter;
+  public static IntakeArm intakeArm;
 
   @Override
   public void robotInit() {
     driveTrain = new DriveTrain();
-    oi = new OI();
     shooter = new Shooter();
+    intakeArm = new IntakeArm();
+
+    oi = new OI();
   }
 
   @Override
@@ -25,16 +32,18 @@ public class Robot extends IterativeRobot {
   @Override
   public void autonomousPeriodic() {
     Scheduler.getInstance().run();
-
   }
 
   @Override
   public void teleopInit() {
+    Scheduler.getInstance().add(new SetHighGear());
+    Scheduler.getInstance().add(new ResetCatapult());
+    Scheduler.getInstance().add(new MoveIntakeArm(Constants.IntakeArm.EXTEND));
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
+
 }