Move all the motors stuff into a saner namespace
Letting the mechanical engineers name software is never a good idea...
Change-Id: I5d0e43d84a8f45693435472cc0e5e288f6190b14
diff --git a/motors/big/medium_salsa.cc b/motors/big/medium_salsa.cc
index dc9d0a8..0bd4489 100644
--- a/motors/big/medium_salsa.cc
+++ b/motors/big/medium_salsa.cc
@@ -13,7 +13,7 @@
#include "motors/util.h"
namespace frc971 {
-namespace salsa {
+namespace motors {
namespace {
::std::atomic<Motor *> global_motor{nullptr};
@@ -269,5 +269,5 @@
return 0;
}
-} // namespace salsa
+} // namespace motors
} // namespace frc971
diff --git a/motors/big/motor_controls.cc b/motors/big/motor_controls.cc
index 6a625bf..82dcc0b 100644
--- a/motors/big/motor_controls.cc
+++ b/motors/big/motor_controls.cc
@@ -3,7 +3,7 @@
#include "motors/peripheral/configuration.h"
namespace frc971 {
-namespace salsa {
+namespace motors {
namespace {
template <int kRows, int kCols>
@@ -239,5 +239,5 @@
return debug_[theta];
}
-} // namespace salsa
+} // namespace motors
} // namespace frc971
diff --git a/motors/big/motor_controls.h b/motors/big/motor_controls.h
index 1f19e6d..b9514fd 100644
--- a/motors/big/motor_controls.h
+++ b/motors/big/motor_controls.h
@@ -10,7 +10,7 @@
#include "Eigen/Dense"
namespace frc971 {
-namespace salsa {
+namespace motors {
class MotorControlsImplementation : public MotorControls {
public:
@@ -56,7 +56,7 @@
int16_t debug_[9];
};
-} // namespace salsa
+} // namespace motors
} // namespace frc971
#endif // MOTORS_MOTOR_CONTROLS_H_