commit d1a70f695cc36243d575523306de70c1e56033d3
author Daniel Petti <djpetti@me.com> Sun Aug 10 16:56:44 2014 -0700
committer Daniel Petti <djpetti@me.com> Sat Oct 25 20:05:44 2014 -0700
tree 8dd19f56e8ad845ba6c70aec9b4a0bb219887dc4
parent c92a4a846c6ba2b3f49e2d14bdce13840a6f71f3

edited joystick_reader so that the OLD_DS does Back Fender Goal in one button

Change-Id: I87915ad9e31afd71c1928ab09cba386793ae789c

frc971/input/joystick_reader.cc

diff --git a/frc971/input/joystick_reader.cc b/frc971/input/joystick_reader.cc
index fc22cab..16e0164 100644
--- a/frc971/input/joystick_reader.cc
+++ b/frc971/input/joystick_reader.cc
@@ -58,7 +58,7 @@
 
 const ButtonLocation kLongShot(3, 5);
 const ButtonLocation kCloseShot(3, 2);
-const ButtonLocation kFenderShot(3, 6);
+const ButtonLocation kFenderShot(3, 3);
 const ButtonLocation kTrussShot(2, 11);
 const ButtonLocation kHumanPlayerShot(3, 2);
 #else
@@ -388,7 +388,11 @@
           -0.035;
     }
 
+#if OLD_DS
+    if (data.IsPressed(kFenderShot)) {
+#else
     if (data.GetAxis(kFlipRobot) > 0.9) {
+#endif
       claw_goal_adjust += claw_separation_adjust;
       claw_goal_adjust *= -1;