diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-18 13:58:06 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-18 13:58:06 -0500 |
| commit | b00bc94212488b2d1ef293765728e5b549fa8b5d (patch) | |
| tree | 02746bf0c16fcd140df93443db1be07dc27dcd00 /src/org | |
| parent | d7da4657e81c878d8a05f1c3b2a10bbb9fb7e704 (diff) | |
oops, fix intake controls
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/usfirst/frc/team4272/robot2016/Teleop.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/org/usfirst/frc/team4272/robot2016/Teleop.java b/src/org/usfirst/frc/team4272/robot2016/Teleop.java index 6794a81..0238aac 100644 --- a/src/org/usfirst/frc/team4272/robot2016/Teleop.java +++ b/src/org/usfirst/frc/team4272/robot2016/Teleop.java @@ -24,12 +24,16 @@ public class Teleop { /* Ball intake/shooter */ if (oi.lStick.getTrigger()) { - control.fBall = control.bBall = -1; + /* intake */ + control.fBall = control.bBall = -.6; } else if (oi.rStick.getTrigger()) { + /* outtake */ control.fBall = 1; if (oi.rStick.getRawButton(3)) { control.bBall = 1; } + } else { + control.fBall = control.bBall = 0; } /* Take pictures */ |