Delete speed variable, initialize intakeWheel, delete: RunIntake, RunIntakeContinuous...

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

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Intake.java b/src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
index bb977814d4174d6f07355f50d1d1a9abdfecbf79..b5e72053c3f90aba576e89913960873b31b99d2b 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.subsystems;
 
+import org.usfirst.frc.team3501.robot.Constants;
+
 import com.ctre.CANTalon;
 
 import edu.wpi.first.wpilibj.command.Subsystem;
@@ -9,13 +11,12 @@ import edu.wpi.first.wpilibj.command.Subsystem;
  */
 public class Intake extends Subsystem {
   public static Intake intake = null;
-  protected double speed = 0;
   private CANTalon intakeWheel;
   public static final double INTAKE_SPEED = 0;
 
   // create speed of intake whee
   public Intake() {
-
+    intakeWheel = new CANTalon(Constants.Intake.INTAKE_ROLLER_PORT);
   }
 
   public static Intake getIntake() {
@@ -31,7 +32,7 @@ public class Intake extends Subsystem {
   }
 
   public void setSpeed(double speed) {
-    this.speed = speed;
+    intakeWheel.set(speed);
   }
 
 }