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/autonomous/auto.cc b/y2014/autonomous/auto.cc
index fe4099a..899d071 100644
--- a/y2014/autonomous/auto.cc
+++ b/y2014/autonomous/auto.cc
@@ -23,7 +23,7 @@
using ::aos::time::Time;
-namespace frc971 {
+namespace y2014 {
namespace autonomous {
namespace time = ::aos::time;
@@ -180,12 +180,12 @@
const ProfileParams kSlowWithBallDrive = {2.5, 2.0};
const ProfileParams kFastTurn = {3.0, 10.0};
-::std::unique_ptr<::frc971::actors::DrivetrainAction> SetDriveGoal(
+::std::unique_ptr<::y2014::actors::DrivetrainAction> SetDriveGoal(
double distance, const ProfileParams drive_params, double theta = 0,
const ProfileParams &turn_params = kFastTurn) {
LOG(INFO, "Driving to %f\n", distance);
- ::frc971::actors::DrivetrainActionParams params;
+ ::y2014::actors::DrivetrainActionParams params;
params.left_initial_position = left_initial_position;
params.right_initial_position = right_initial_position;
params.y_offset = distance;
@@ -328,7 +328,7 @@
private:
static const uint64_t kThreshold = 5;
- ::frc971::HotGoal start_counts_;
+ ::y2014::HotGoal start_counts_;
bool start_counts_valid_;
};
@@ -348,17 +348,17 @@
LOG(INFO, "Handling auto mode\n");
AutoVersion auto_version;
- ::frc971::sensors::auto_mode.FetchLatest();
- if (!::frc971::sensors::auto_mode.get()) {
+ ::y2014::sensors::auto_mode.FetchLatest();
+ if (!::y2014::sensors::auto_mode.get()) {
LOG(WARNING, "not sure which auto mode to use\n");
auto_version = AutoVersion::kStraight;
} else {
static const double kSelectorMin = 0.2, kSelectorMax = 4.4;
const double kSelectorStep = (kSelectorMax - kSelectorMin) / 3.0;
- if (::frc971::sensors::auto_mode->voltage < kSelectorStep + kSelectorMin) {
+ if (::y2014::sensors::auto_mode->voltage < kSelectorStep + kSelectorMin) {
auto_version = AutoVersion::kSingleHot;
- } else if (::frc971::sensors::auto_mode->voltage <
+ } else if (::y2014::sensors::auto_mode->voltage <
2 * kSelectorStep + kSelectorMin) {
auto_version = AutoVersion::kStraight;
} else {
@@ -529,4 +529,4 @@
}
} // namespace autonomous
-} // namespace frc971
+} // namespace y2014
diff --git a/y2014/autonomous/auto.h b/y2014/autonomous/auto.h
index 3e4885f..dd00bba 100644
--- a/y2014/autonomous/auto.h
+++ b/y2014/autonomous/auto.h
@@ -1,12 +1,12 @@
#ifndef Y2014_AUTONOMOUS_AUTO_H_
#define Y2014_AUTONOMOUS_AUTO_H_
-namespace frc971 {
+namespace y2014 {
namespace autonomous {
void HandleAuto();
} // namespace autonomous
-} // namespace frc971
+} // namespace y2014
#endif // Y2014_AUTONOMOUS_AUTO_H_
diff --git a/y2014/autonomous/auto_main.cc b/y2014/autonomous/auto_main.cc
index 3dbad2c..253b237 100644
--- a/y2014/autonomous/auto_main.cc
+++ b/y2014/autonomous/auto_main.cc
@@ -25,7 +25,7 @@
}
LOG(INFO, "Starting auto mode\n");
::aos::time::Time start_time = ::aos::time::Time::Now();
- ::frc971::autonomous::HandleAuto();
+ ::y2014::autonomous::HandleAuto();
::aos::time::Time elapsed_time = ::aos::time::Time::Now() - start_time;
LOG(INFO, "Auto mode exited in %f, waiting for it to finish.\n",