fix Robot.java bug: intantiate IntakeArm subsystem, not constants

[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 a86721d0a1a4ac73903f5ba6a2c63cae614c1137..f4001774cf4e607cfcbb9aa3e1763557c1cf0eda 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,36 +1,38 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.Constants.Defense;
+import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
+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;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
 public class Robot extends IterativeRobot {
-  public static OI oi;
-  public static DriveTrain driveTrain;
-  public static Shooter shooter;
-  public static Scaler scaler;
+       public static OI oi;
+       public static DriveTrain driveTrain;
+       public static Shooter shooter;
+       public static Scaler scaler;
+       public static IntakeArm intakeArm;
+       public static DefenseArm defenseArm;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
       positionFourDefense, positionFiveDefense;
 
-  public static Lidar lidar;
-
   @Override
   public void robotInit() {
     driveTrain = new DriveTrain();
     oi = new OI();
     shooter = new Shooter();
     scaler = new Scaler();
-    lidar = new Lidar(I2C.Port.kOnboard);
+    defenseArm = new DefenseArm();
+    intakeArm = new IntakeArm();
 
     // Sendable Choosers allows the driver to select the position of the robot
     // and the positions of the defenses from a drop-down menu on the Smart
@@ -123,18 +125,11 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-    lidar.start();
   }
 
   @Override
   public void teleopPeriodic() {
-    printLidarValues();
     Scheduler.getInstance().run();
 
   }
-
-  public void printLidarValues() {
-
-    System.out.println(lidar.pidGet());
-  }
 }