Rename control loop queues to the new convention.
Change-Id: I306be7867038e384af19d8b4db77eaf6c20b5c7e
diff --git a/y2014/control_loops/shooter/shooter.cc b/y2014/control_loops/shooter/shooter.cc
index 2a9f6e8..5211967 100644
--- a/y2014/control_loops/shooter/shooter.cc
+++ b/y2014/control_loops/shooter/shooter.cc
@@ -102,8 +102,8 @@
absolute_position(), previous_offset, offset_));
}
-ShooterMotor::ShooterMotor(control_loops::ShooterGroup *my_shooter)
- : aos::controls::ControlLoop<control_loops::ShooterGroup>(my_shooter),
+ShooterMotor::ShooterMotor(control_loops::ShooterQueue *my_shooter)
+ : aos::controls::ControlLoop<control_loops::ShooterQueue>(my_shooter),
shooter_(MakeShooterLoop()),
state_(STATE_INITIALIZE),
loading_problem_end_time_(0, 0),
@@ -153,7 +153,7 @@
}
void ShooterMotor::CheckCalibrations(
- const control_loops::ShooterGroup::Position *position) {
+ const control_loops::ShooterQueue::Position *position) {
CHECK_NOTNULL(position);
const frc971::constants::Values &values = constants::GetValues();
@@ -202,10 +202,10 @@
// Positive is out, and positive power is out.
void ShooterMotor::RunIteration(
- const control_loops::ShooterGroup::Goal *goal,
- const control_loops::ShooterGroup::Position *position,
- control_loops::ShooterGroup::Output *output,
- control_loops::ShooterGroup::Status *status) {
+ const control_loops::ShooterQueue::Goal *goal,
+ const control_loops::ShooterQueue::Position *position,
+ control_loops::ShooterQueue::Output *output,
+ control_loops::ShooterQueue::Status *status) {
constexpr double dt = 0.01;
if (goal && ::std::isnan(goal->shot_power)) {