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/drivetrain/drivetrain.cc b/y2014/control_loops/drivetrain/drivetrain.cc
index 23b03f3..98974a5 100644
--- a/y2014/control_loops/drivetrain/drivetrain.cc
+++ b/y2014/control_loops/drivetrain/drivetrain.cc
@@ -30,18 +30,18 @@
namespace drivetrain {
DrivetrainLoop::DrivetrainLoop(
- ::frc971::control_loops::DrivetrainQueue *my_drivetrain)
- : aos::controls::ControlLoop<::frc971::control_loops::DrivetrainQueue>(
+ ::y2014::control_loops::DrivetrainQueue *my_drivetrain)
+ : aos::controls::ControlLoop<::y2014::control_loops::DrivetrainQueue>(
my_drivetrain),
kf_(::y2014::control_loops::drivetrain::MakeKFDrivetrainLoop()) {
::aos::controls::HPolytope<0>::Init();
}
void DrivetrainLoop::RunIteration(
- const ::frc971::control_loops::DrivetrainQueue::Goal *goal,
- const ::frc971::control_loops::DrivetrainQueue::Position *position,
- ::frc971::control_loops::DrivetrainQueue::Output *output,
- ::frc971::control_loops::DrivetrainQueue::Status *status) {
+ const ::y2014::control_loops::DrivetrainQueue::Goal *goal,
+ const ::y2014::control_loops::DrivetrainQueue::Position *position,
+ ::y2014::control_loops::DrivetrainQueue::Output *output,
+ ::y2014::control_loops::DrivetrainQueue::Status *status) {
bool bad_pos = false;
if (position == nullptr) {
LOG_INTERVAL(no_position_);