Hide control_loop() inside ControlLoop better
control_loop() is a depenency we want to remove when we convert to
event loops. We want to only use the queue group to hold strings.
Change-Id: I3f444cd505ebb1e448f050e08f416e0901ce8afb
diff --git a/y2014/control_loops/shooter/shooter.h b/y2014/control_loops/shooter/shooter.h
index 0530012..75a05db 100644
--- a/y2014/control_loops/shooter/shooter.h
+++ b/y2014/control_loops/shooter/shooter.h
@@ -41,7 +41,7 @@
const static int kZeroingMaxVoltage = 5;
- virtual void CapU();
+ void CapU() override;
// Returns the accumulated voltage.
double voltage() const { return voltage_; }
@@ -158,15 +158,15 @@
State state() { return state_; }
protected:
- virtual void RunIteration(
+ void RunIteration(
const ::y2014::control_loops::ShooterQueue::Goal *goal,
const ::y2014::control_loops::ShooterQueue::Position *position,
::y2014::control_loops::ShooterQueue::Output *output,
- ::y2014::control_loops::ShooterQueue::Status *status);
+ ::y2014::control_loops::ShooterQueue::Status *status) override;
private:
// We have to override this to keep the pistons in the correct positions.
- virtual void ZeroOutputs();
+ void Zero(::y2014::control_loops::ShooterQueue::Output *output) override;
// Friend the test classes for acces to the internal state.
friend class testing::ShooterTest_UnloadWindupPositive_Test;