Make the turret go to the right intake to save time
We weren't latching which intake to go to.
Change-Id: I0e28a80838cd28ac2594d924a9c814b6ff3df8d0
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/y2022/joystick_reader.cc b/y2022/joystick_reader.cc
index 653e1c1..fe52db7 100644
--- a/y2022/joystick_reader.cc
+++ b/y2022/joystick_reader.cc
@@ -55,7 +55,7 @@
const ButtonLocation kCatapultPos(4, 3);
const ButtonLocation kFire(4, 1);
const ButtonLocation kTurret(4, 15);
-const ButtonLocation kAutoAim(4, 2);
+const ButtonLocation kAutoAim(4, 16);
const ButtonLocation kClimberExtend(4, 6);
const ButtonLocation kClimberIntakes(4, 5);
@@ -173,7 +173,7 @@
double roller_front_speed = 0.0;
double roller_back_speed = 0.0;
- std::optional<double> turret_pos = 0.0;
+ std::optional<double> turret_pos = std::nullopt;
double climber_position = 0.01;
@@ -261,7 +261,6 @@
if (data.IsPressed(kFire)) {
fire = true;
// Provide a default turret goal.
- turret_pos = 0.0;
}
if (data.IsPressed(kClimberIntakes)) {