Finish moving //y2014/... into its own namespace
Stuff didn't compile in the half-switched state it was in before.
Change-Id: I00ec3c79a2682982b12d4e8c8e682cb8625eb06d
diff --git a/y2014/control_loops/claw/claw.h b/y2014/control_loops/claw/claw.h
index 86875bb..88f038f 100644
--- a/y2014/control_loops/claw/claw.h
+++ b/y2014/control_loops/claw/claw.h
@@ -77,9 +77,9 @@
}
JointZeroingState zeroing_state() const { return zeroing_state_; }
- void SetPositionValues(const ::frc971::control_loops::HalfClawPosition &claw);
+ void SetPositionValues(const ::y2014::control_loops::HalfClawPosition &claw);
- void Reset(const ::frc971::control_loops::HalfClawPosition &claw);
+ void Reset(const ::y2014::control_loops::HalfClawPosition &claw);
double absolute_position() const { return encoder() + offset(); }
@@ -183,10 +183,10 @@
};
class ClawMotor
- : public aos::controls::ControlLoop<::frc971::control_loops::ClawQueue> {
+ : public aos::controls::ControlLoop<::y2014::control_loops::ClawQueue> {
public:
- explicit ClawMotor(::frc971::control_loops::ClawQueue *my_claw =
- &::frc971::control_loops::claw_queue);
+ explicit ClawMotor(::y2014::control_loops::ClawQueue *my_claw =
+ &::y2014::control_loops::claw_queue);
// True if the state machine is ready.
bool capped_goal() const { return capped_goal_; }
@@ -217,10 +217,10 @@
protected:
virtual void RunIteration(
- const ::frc971::control_loops::ClawQueue::Goal *goal,
- const ::frc971::control_loops::ClawQueue::Position *position,
- ::frc971::control_loops::ClawQueue::Output *output,
- ::frc971::control_loops::ClawQueue::Status *status);
+ const ::y2014::control_loops::ClawQueue::Goal *goal,
+ const ::y2014::control_loops::ClawQueue::Position *position,
+ ::y2014::control_loops::ClawQueue::Output *output,
+ ::y2014::control_loops::ClawQueue::Status *status);
double top_absolute_position() const {
return claw_.X_hat(1, 0) + claw_.X_hat(0, 0);