From b00bc94212488b2d1ef293765728e5b549fa8b5d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 18 Jan 2016 13:58:06 -0500 Subject: oops, fix intake controls --- src/org/usfirst/frc/team4272/robot2016/Teleop.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 */ -- cgit v1.2.3