Moved 2014 drivetrain code into y2014 namespace.
Change-Id: I74a1922f846a288725df2aea01c5c9e1b99e07b3
diff --git a/y2014/control_loops/drivetrain/drivetrain.h b/y2014/control_loops/drivetrain/drivetrain.h
index c5b731d..a77ab15 100644
--- a/y2014/control_loops/drivetrain/drivetrain.h
+++ b/y2014/control_loops/drivetrain/drivetrain.h
@@ -11,16 +11,18 @@
#include "y2014/control_loops/drivetrain/ssdrivetrain.h"
#include "aos/common/util/log_interval.h"
-namespace frc971 {
+namespace y2014 {
namespace control_loops {
+namespace drivetrain {
class DrivetrainLoop
- : public aos::controls::ControlLoop<control_loops::DrivetrainQueue> {
+ : public aos::controls::ControlLoop<::frc971::control_loops::DrivetrainQueue> {
public:
// Constructs a control loop which can take a Drivetrain or defaults to the
// drivetrain at frc971::control_loops::drivetrain
- explicit DrivetrainLoop(control_loops::DrivetrainQueue *my_drivetrain =
- &control_loops::drivetrain_queue)
+ explicit DrivetrainLoop(
+ ::frc971::control_loops::DrivetrainQueue *my_drivetrain =
+ &::frc971::control_loops::drivetrain_queue)
: aos::controls::ControlLoop<control_loops::DrivetrainQueue>(
my_drivetrain) {
::aos::controls::HPolytope<0>::Init();
@@ -29,10 +31,10 @@
protected:
// Executes one cycle of the control loop.
virtual void RunIteration(
- const control_loops::DrivetrainQueue::Goal *goal,
- const control_loops::DrivetrainQueue::Position *position,
- control_loops::DrivetrainQueue::Output *output,
- control_loops::DrivetrainQueue::Status *status);
+ 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);
typedef ::aos::util::SimpleLogInterval SimpleLogInterval;
SimpleLogInterval no_position_ = SimpleLogInterval(
@@ -42,7 +44,8 @@
DrivetrainMotorsSS dt_closedloop_;
};
+} // namespace drivetrain
} // namespace control_loops
-} // namespace frc971
+} // namespace y2014
#endif // Y2014_CONTROL_LOOPS_DRIVETRAIN_H_