commit f34bbe00016e4bfb6b0c4f50be1dbb31a5cd72f5
author Brian Silverman <brians> Sun Sep 01 09:08:32 2013 -0700
committer Brian Silverman <brians> Sun Sep 01 09:08:32 2013 -0700
tree 0aa96a3880b45017a96011113a8d6910d67130c4
parent a1214ae4fdc94e26530b204c4733bae20a54e7d6

made the pit shot override any other shot

frc971/input/JoystickReader.cc

diff --git a/frc971/input/JoystickReader.cc b/frc971/input/JoystickReader.cc
index 7538f6b..31f0385 100644
--- a/frc971/input/JoystickReader.cc
+++ b/frc971/input/JoystickReader.cc
@@ -150,7 +150,10 @@
           shooter.goal.MakeMessage();
       shooter_goal->velocity = 0;
       static double angle_adjust_goal = 0.42;
-      if (data.IsPressed(kLongShot)) {
+      if (data.IsPressed(kPitShot1) && data.IsPressed(kPitShot2)) {
+        shooter_goal->velocity = 131;
+        angle_adjust_goal = 0.70;
+      } else if (data.IsPressed(kLongShot)) {
 #if 0
         target_angle.FetchLatest();
         if (target_angle.IsNewerThanMS(500)) {
@@ -179,9 +182,6 @@
       } else if (data.IsPressed(kShortShot)) {
         shooter_goal->velocity = 375;
         angle_adjust_goal = 0.7267;
-      } else if (data.IsPressed(kPitShot1) && data.IsPressed(kPitShot2)) {
-        shooter_goal->velocity = 131;
-        angle_adjust_goal = 0.70;
       }
       angle_adjust.goal.MakeWithBuilder().goal(angle_adjust_goal).Send();