add motors for cheval de frise for intake arm and angle adjuster for shooter

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index a3a5be0af181c6b129bdf0e8b52501db155fbfd2..91a8a39765f1e927dedab570cc504eca54276813 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -8,6 +8,7 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 public class IntakeArm extends Subsystem {\r
 \r
   private CANTalon intake;\r
+  private CANTalon chevalDeFrise;\r
 \r
   public IntakeArm() {\r
     intake = new CANTalon(Constants.IntakeArm.PORT);\r

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index bda816f402fa2bae9c0ec35d09601275a9cbc7a9..035ee86ce029e831dec3242fc8f3692e6c1a6114 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -8,6 +8,7 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Shooter extends Subsystem {
   private CANTalon shooter;
+  private CANTalon angleAdjuster;
   private DoubleSolenoid punch;
 
   public Shooter() {