commit b601d895d845e82f4c01686c814d4a97d44393c8
author Brian Silverman <brian@peloton-tech.com> Sun Dec 20 18:24:38 2015 -0500
committer Brian Silverman <brian@peloton-tech.com> Sun Dec 20 18:24:38 2015 -0500
tree 32b84024ec13028e6f67a648845664c50e7a37a1
parent 8a7a2bd9fa27a6e140d6a0c210b410656f2a8528

Finish moving //y2014/... into its own namespace

Stuff didn't compile in the half-switched state it was in before.

Change-Id: I00ec3c79a2682982b12d4e8c8e682cb8625eb06d

y2014/control_loops/claw/claw.cc

diff --git a/y2014/control_loops/claw/claw.cc b/y2014/control_loops/claw/claw.cc
index 040cef3..4f71410 100644
--- a/y2014/control_loops/claw/claw.cc
+++ b/y2014/control_loops/claw/claw.cc
@@ -50,7 +50,7 @@
 using ::frc971::HallEffectTracker;
 using ::y2014::control_loops::claw::kDt;
 using ::frc971::control_loops::DoCoerceGoal;
-using ::frc971::control_loops::ClawPositionToLog;
+using ::y2014::control_loops::ClawPositionToLog;
 
 static const double kZeroingVoltage = 4.0;
 static const double kMaxVoltage = 12.0;
@@ -220,7 +220,7 @@
       last_encoder_(0.0) {}
 
 void ZeroedStateFeedbackLoop::SetPositionValues(
-    const ::frc971::control_loops::HalfClawPosition &claw) {
+    const ::y2014::control_loops::HalfClawPosition &claw) {
   front_.Update(claw.front);
   calibration_.Update(claw.calibration);
   back_.Update(claw.back);
@@ -295,7 +295,7 @@
 }
 
 void ZeroedStateFeedbackLoop::Reset(
-    const ::frc971::control_loops::HalfClawPosition &claw) {
+    const ::y2014::control_loops::HalfClawPosition &claw) {
   set_zeroing_state(ZeroedStateFeedbackLoop::UNKNOWN_POSITION);
 
   front_.Reset(claw.front);
@@ -371,8 +371,8 @@
   return false;
 }
 
-ClawMotor::ClawMotor(::frc971::control_loops::ClawQueue *my_claw)
-    : aos::controls::ControlLoop<::frc971::control_loops::ClawQueue>(my_claw),
+ClawMotor::ClawMotor(::y2014::control_loops::ClawQueue *my_claw)
+    : aos::controls::ControlLoop<::y2014::control_loops::ClawQueue>(my_claw),
       has_top_claw_goal_(false),
       top_claw_goal_(0.0),
       top_claw_(this),
@@ -617,10 +617,10 @@
 
 // Positive angle is up, and positive power is up.
 void ClawMotor::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) {
   // Disable the motors now so that all early returns will return with the
   // motors disabled.
   if (output) {