| commit | e13fa4ec631361df0deb129c8b1e38f8b50e5595 | [log] [tgz] |
|---|---|---|
| author | Brian Silverman <brians> | Fri Apr 05 18:55:48 2013 -0700 |
| committer | Brian Silverman <brians> | Fri Apr 05 18:55:48 2013 -0700 |
| tree | 0ca04ba7fcce0398e243a56b813082685d624564 | |
| parent | f78d1204d76dc1afb141cc57226b5d52b599786c [diff] |
changed which buttons pit shot is
diff --git a/frc971/input/JoystickReader.cc b/frc971/input/JoystickReader.cc index 0be561f..a884393 100644 --- a/frc971/input/JoystickReader.cc +++ b/frc971/input/JoystickReader.cc
@@ -151,7 +151,7 @@ // short shot shooter_goal->velocity = 375; angle_adjust_goal = 0.7267; - } else if (Pressed(2, 9)) { + } else if (Pressed(1, 7) && Pressed(1, 10)) { // pit shot shooter_goal->velocity = 131; angle_adjust_goal = 0.70;