From 07891185449d9c400627d5ad088bfe65ae5ca817 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 18 Jan 2016 15:51:09 -0500 Subject: stuff --- src/org/usfirst/frc/team4272/robot2016/Teleop.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/org/usfirst/frc/team4272/robot2016/Teleop.java') diff --git a/src/org/usfirst/frc/team4272/robot2016/Teleop.java b/src/org/usfirst/frc/team4272/robot2016/Teleop.java index 0238aac..4853162 100644 --- a/src/org/usfirst/frc/team4272/robot2016/Teleop.java +++ b/src/org/usfirst/frc/team4272/robot2016/Teleop.java @@ -2,7 +2,7 @@ package org.usfirst.frc.team4272.robot2016; import org.usfirst.frc.team4272.robotlib.PushButton; import org.usfirst.frc.team4272.robotlib.Xbox360Controller.Button; - +import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj.Joystick; public class Teleop { @@ -25,12 +25,14 @@ public class Teleop { /* Ball intake/shooter */ if (oi.lStick.getTrigger()) { /* intake */ - control.fBall = control.bBall = -.6; + control.fBall = control.bBall = -SmartDashboard.getNumber("intakeSpeed"); } else if (oi.rStick.getTrigger()) { /* outtake */ control.fBall = 1; if (oi.rStick.getRawButton(3)) { control.bBall = 1; + } else { + control.bBall = 0; } } else { control.fBall = control.bBall = 0; -- cgit v1.2.3