projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Saved
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
driving
/
JoystickDrive.java
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 d12614f06ca99b2fb64a1c03173f39037c453a7a..aa9bfafffe20b46aa0ac71a372d57feda8e4f5cb 100755
(executable)
--- 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 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;
/**
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 {
*/
public class JoystickDrive extends Command {
@@
-20,10
+23,15
@@
public class JoystickDrive extends Command {
@Override
protected void execute() {
@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);
Robot.getDriveTrain().joystickDrive(-thrust, -twist);
+
+ /*
+ * double left = OI.leftJoystick.getY(); double right =
+ * OI.rightJoystick.getY(); Robot.getDriveTrain().tankDrive(-left, -right);
+ */
}
@Override
}
@Override