diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-13 09:14:47 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-13 09:14:47 -0400 |
| commit | 28552a1bb8104f6ef0a8d9360fdb6562efc27578 (patch) | |
| tree | b2fe99f48b511fd47fac449c9bd34ac386e0f8f2 /src/org/usfirst/frc/team4272/robot2016/Teleop.java | |
| parent | 9c425fc33c6d579b448ecebf8c3003ad13ad2013 (diff) | |
saturday
Diffstat (limited to 'src/org/usfirst/frc/team4272/robot2016/Teleop.java')
| -rw-r--r-- | src/org/usfirst/frc/team4272/robot2016/Teleop.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/usfirst/frc/team4272/robot2016/Teleop.java b/src/org/usfirst/frc/team4272/robot2016/Teleop.java index 19dfc6e..56e2dc7 100644 --- a/src/org/usfirst/frc/team4272/robot2016/Teleop.java +++ b/src/org/usfirst/frc/team4272/robot2016/Teleop.java @@ -39,8 +39,8 @@ public class Teleop { double bBall = bound(-1, fBall, 0) + oneIf(oi.xbox.getButton(Button.A)) - oneIf(oi.xbox.getButton(Button.B)); boolean ballL = robot.ballL.get(); - control.fBall = bound(-oneIf(ballL), fBall, 1); - control.bBall = bound(-oneIf(ballL), bBall < 0 ? 0.75*bBall : bBall, 1); + control.fBall = bound(-oneIf(ballL), fBall < 0 ? 0.75*fBall : fBall, 1); + control.bBall = bound(-oneIf(ballL), bBall < 0 ? 0.85*bBall : bBall, 1); /* I'm eyeballing 10 degrees ≈ 50 clicks */ if (robot.armE.pidGet() < 50 && !robot.armL.get()) { |