commit 73c48398feac0a4514b96c341daa92d7b78177fb
author Brian Silverman <brians> Sat Apr 05 07:07:41 2014 -0700
committer Brian Silverman <brians> Sat Apr 05 07:07:41 2014 -0700
tree 21cfae085c74c64b5b3304aaec58a691f523da7b
parent ed9df2fd9d8768313fb0ce4dd4f5732295c748bc

tweaking and changing around shots

frc971/input/joystick_reader.cc

diff --git a/frc971/input/joystick_reader.cc b/frc971/input/joystick_reader.cc
index 3e666fc..afa602e 100644
--- a/frc971/input/joystick_reader.cc
+++ b/frc971/input/joystick_reader.cc
@@ -98,7 +98,7 @@
     {-1.06, kShootSeparation}, 140, 0.04, kIntakePower};
 // 3/4" plunger {-1.04, kShootSeparation}, 140, 0.04, kIntakePower};
 const ShotGoal kFlippedLongShotGoal = {
-    {0.94, kShootSeparation}, 140, 0.09, kIntakePower};
+    {0.96, kShootSeparation}, 140, 0.09, kIntakePower};
 // 3/4 " plunger {0.97, kShootSeparation}, 140, 0.08, kIntakePower};
 
 // 78" between near edge of colored line and rear edge of bumper
@@ -110,14 +110,17 @@
 // 3/4" plunger {0.80, kShootSeparation}, 105, 0.2, kIntakePower};
 
 const ShotGoal kShortShotGoal = {
-    {-0.68, kShootSeparation}, 77.0, 0.4, kIntakePower};
-const ShotGoal kFlippedShortShotGoal = {
     {0.67, kShootSeparation}, 115.0, 0.4, kIntakePower};
+const ShotGoal kFlippedShortShotGoal = kShortShotGoal;
 
 const ShotGoal kHumanShotGoal = {
     {-0.90, kShootSeparation}, 140, 0.04, kIntakePower};
+const ShotGoal kFlippedHumanShotGoal = {
+    {0.90, kShootSeparation}, 140, 0, kIntakePower};
 const ShotGoal kTrussShotGoal = {
-    {-0.05, kShootSeparation}, 73.0, 0, kIntakePower};
+    {-0.68, kShootSeparation}, 77.0, 0.4, kIntakePower};
+const ShotGoal kFlippedTrussShotGoal = {
+    {0.68, kShootSeparation}, 77.0, 0.4, kIntakePower};
 
 // Makes a new ShootAction action.
 ::std::unique_ptr<TypedAction< ::frc971::actions::CatchActionGroup>>
@@ -364,11 +367,11 @@
       } else if (data.PosEdge(kHumanPlayerShot)) {
         action_queue_.CancelAllActions();
         LOG(DEBUG, "Canceling\n");
-        SetGoal(kHumanShotGoal);
+        SetGoal(kFlippedHumanShotGoal);
       } else if (data.PosEdge(kTrussShot)) {
         action_queue_.CancelAllActions();
         LOG(DEBUG, "Canceling\n");
-        SetGoal(kTrussShotGoal);
+        SetGoal(kFlippedTrussShotGoal);
       }
     } else {
       if (data.IsPressed(kIntakeOpenPosition)) {