commit 30e45ffdb4e35e68a58d56c3bbd5c16aa3cf80d1
author Austin Schuh <austin.linux@gmail.com> Sat Oct 16 18:33:53 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Oct 16 18:34:45 2021 -0700
tree 65e2f79d7eefbe2eea017568209fd2f5dd2cc81f
parent a69ed2faefe7830782bdcd9b27d42512aa9bbb8a

Tune shot table for close up

We needed more points, and I think we tuned for the wrong distance once.

Change-Id: I8e02d7400f0bc67bd3e5471795a974bd9b363596
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

y2020/joystick_reader.cc

diff --git a/y2020/joystick_reader.cc b/y2020/joystick_reader.cc
index 9934571..34d3f54 100644
--- a/y2020/joystick_reader.cc
+++ b/y2020/joystick_reader.cc
@@ -43,9 +43,11 @@
 const ButtonLocation kAutoNoHood(3, 5);
 const ButtonLocation kHood(3, 4);
 const ButtonLocation kShootSlow(4, 2);
+const ButtonLocation kFixedTurret(3, 1);
 const ButtonLocation kFeed(4, 1);
 const ButtonLocation kFeedDriver(1, 2);
 const ButtonLocation kIntakeExtend(3, 9);
+const ButtonLocation kIntakeExtendDriver(1, 4);
 const ButtonLocation kIntakeIn(4, 4);
 const ButtonLocation kSpit(4, 3);
 const ButtonLocation kLocalizerReset(3, 8);
@@ -111,8 +113,7 @@
     double climber_speed = 0.0;
     bool preload_intake = false;
 
-    const bool auto_track =
-        data.IsPressed(kAutoTrack) || data.IsPressed(kAutoNoHood);
+    const bool auto_track = data.IsPressed(kAutoTrack);
 
     if (data.IsPressed(kHood)) {
       hood_pos = 0.45;
@@ -130,7 +131,12 @@
       turret_pos = 0.0;
     }
 
-    if (data.IsPressed(kShootFast)) {
+    if (data.IsPressed(kAutoNoHood)) {
+      if (setpoint_fetcher_.get()) {
+        accelerator_speed = setpoint_fetcher_->accelerator();
+        finisher_speed = setpoint_fetcher_->finisher();
+      }
+    } else if (data.IsPressed(kShootFast)) {
       if (setpoint_fetcher_.get()) {
         accelerator_speed = setpoint_fetcher_->accelerator();
         finisher_speed = setpoint_fetcher_->finisher();
@@ -143,7 +149,7 @@
       finisher_speed = 300.0;
     }
 
-    if (data.IsPressed(kIntakeExtend)) {
+    if (data.IsPressed(kIntakeExtend) || data.IsPressed(kIntakeExtendDriver)) {
       intake_pos = 1.2;
       roller_speed = 7.0f;
       roller_speed_compensation = 2.0f;
@@ -210,10 +216,14 @@
                                                data.IsPressed(kFeedDriver));
       superstructure_goal_builder.add_climber_voltage(climber_speed);
 
-      superstructure_goal_builder.add_turret_tracking(auto_track);
+      superstructure_goal_builder.add_turret_tracking(
+          !data.IsPressed(kFixedTurret));
       superstructure_goal_builder.add_hood_tracking(
-          auto_track && !data.IsPressed(kAutoNoHood));
-      superstructure_goal_builder.add_shooter_tracking(auto_track);
+          !data.IsPressed(kFixedTurret) && !data.IsPressed(kAutoNoHood));
+      superstructure_goal_builder.add_shooter_tracking(
+          auto_track ||
+          (!data.IsPressed(kFixedTurret) && !data.IsPressed(kAutoNoHood) &&
+           data.IsPressed(kFeedDriver)));
       superstructure_goal_builder.add_intake_preloading(preload_intake);
 
       if (!builder.Send(superstructure_goal_builder.Finish())) {