X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fdriving%2FJoystickDrive.java;h=aa9bfafffe20b46aa0ac71a372d57feda8e4f5cb;hb=8275a069e1891bd27156dcd947a897519c42a3a3;hp=d12614f06ca99b2fb64a1c03173f39037c453a7a;hpb=5483fde92e93a81b148371eb4eb9f69c44a7d591;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/commands/driving/JoystickDrive.java b/src/org/usfirst/frc/team3501/robot/commands/driving/JoystickDrive.java
index d12614f..aa9bfaf 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/JoystickDrive.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/JoystickDrive.java
@@ -3,10 +3,13 @@ package org.usfirst.frc.team3501.robot.commands.driving;
 import org.usfirst.frc.team3501.robot.OI;
 import org.usfirst.frc.team3501.robot.Robot;
 
+import edu.wpi.first.wpilibj.Joystick.AxisType;
 import edu.wpi.first.wpilibj.command.Command;
 
 /**
- *
+ * This command will run throughout teleop and listens for joystick inputs to
+ * drive the driveTrain. This never finishes until teleop ends. - works in
+ * conjunction with OI.java
  */
 public class JoystickDrive extends Command {
 
@@ -20,10 +23,15 @@ public class JoystickDrive extends Command {
 
   @Override
   protected void execute() {
-    final double thrust = OI.rightJoystick.getY();
-    final double twist = OI.rightJoystick.getTwist();
+    final double thrust = OI.xboxController.getY();
+    final double twist = OI.xboxController.getAxis(AxisType.kZ);
 
     Robot.getDriveTrain().joystickDrive(-thrust, -twist);
+
+    /*
+     * double left = OI.leftJoystick.getY(); double right =
+     * OI.rightJoystick.getY(); Robot.getDriveTrain().tankDrive(-left, -right);
+     */
   }
 
   @Override