summaryrefslogtreecommitdiff
path: root/src/org/usfirst/frc/team4272/robot2016/Teleop.java
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-02-17 16:37:41 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-02-17 16:37:41 -0500
commitf28aaa96edf9bea5843ce0ab9b0110c84ca914e9 (patch)
tree051c4a2f6028fe1e9f6aa13ba2619ad93529b869 /src/org/usfirst/frc/team4272/robot2016/Teleop.java
parent363e1299ff558f62aba9e6b52fff646b4eb61426 (diff)
stuff
Diffstat (limited to 'src/org/usfirst/frc/team4272/robot2016/Teleop.java')
-rw-r--r--src/org/usfirst/frc/team4272/robot2016/Teleop.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/usfirst/frc/team4272/robot2016/Teleop.java b/src/org/usfirst/frc/team4272/robot2016/Teleop.java
index 7b3ca55..e69c8f0 100644
--- a/src/org/usfirst/frc/team4272/robot2016/Teleop.java
+++ b/src/org/usfirst/frc/team4272/robot2016/Teleop.java
@@ -3,7 +3,6 @@ package org.usfirst.frc.team4272.robot2016;
//import org.usfirst.frc.team4272.robotlib.PushButton;
import org.usfirst.frc.team4272.robotlib.Xbox360Controller.Axis;
import org.usfirst.frc.team4272.robotlib.Xbox360Controller.Button;
-import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj.Joystick;
public class Teleop {
@@ -40,10 +39,8 @@ public class Teleop {
- oneIf(oi.xbox.getButton(Button.B)),
1);
control.fBall = control.fBall < 0 ? 0.5*control.fBall : control.fBall;
- control.bBall = control.bBall < 0 ? 0.5*control.bBall : control.bBall;
+ control.bBall = control.bBall < 0 ? 0.75*control.bBall : control.bBall;
- SmartDashboard.putNumber("fBall", control.fBall);
- SmartDashboard.putNumber("bBall", control.bBall);
/* Take pictures */
/*