| commit | ac4d88767f9e92e57d88f112abe49ef237f75da0 | [log] [tgz] |
|---|---|---|
| author | Niko Sohmers <nikolai@sohmers.com> | Fri Feb 23 13:55:47 2024 -0800 |
| committer | Niko Sohmers <nikolai@sohmers.com> | Fri Feb 23 13:55:47 2024 -0800 |
| tree | 31a16451943a44659899c88a9cf083f765626535 | |
| parent | 0b3f5f68208b99becc5b242dcd6270004e858d0a [diff] [blame] |
Add turret to intake collision avoidance Signed-off-by: Maxwell Henderson <mxwhenderson@gmail.com> Change-Id: Idca062b4ff7ddca289581baf032736dadbf71e8c
diff --git a/y2024/control_loops/superstructure/superstructure.h b/y2024/control_loops/superstructure/superstructure.h index 6c43863..650092b 100644 --- a/y2024/control_loops/superstructure/superstructure.h +++ b/y2024/control_loops/superstructure/superstructure.h
@@ -61,6 +61,8 @@ drivetrain_status_fetcher_; aos::Fetcher<aos::JoystickState> joystick_state_fetcher_; + CollisionAvoidance collision_avoidance_; + aos::Alliance alliance_ = aos::Alliance::kInvalid; TransferRollerGoal transfer_goal_;