Rename frc971 namespace to y2014 in strings too
This was making all the solenoids not work.
Change-Id: I2f9cb2ca150c3dd87e360066bd0195b5ccb599d7
diff --git a/y2014/control_loops/claw/claw_lib_test.cc b/y2014/control_loops/claw/claw_lib_test.cc
index afce10e..8a92bce 100644
--- a/y2014/control_loops/claw/claw_lib_test.cc
+++ b/y2014/control_loops/claw/claw_lib_test.cc
@@ -46,11 +46,11 @@
ClawMotorSimulation(double initial_top_position,
double initial_bottom_position)
: claw_plant_(new StateFeedbackPlant<4, 2, 2>(MakeClawPlant())),
- claw_queue(".frc971.control_loops.claw_queue", 0x9f1a99dd,
- ".frc971.control_loops.claw_queue.goal",
- ".frc971.control_loops.claw_queue.position",
- ".frc971.control_loops.claw_queue.output",
- ".frc971.control_loops.claw_queue.status") {
+ claw_queue(".y2014.control_loops.claw_queue", 0x9f1a99dd,
+ ".y2014.control_loops.claw_queue.goal",
+ ".y2014.control_loops.claw_queue.position",
+ ".y2014.control_loops.claw_queue.output",
+ ".y2014.control_loops.claw_queue.status") {
Reinitialize(initial_top_position, initial_bottom_position);
}
@@ -262,11 +262,11 @@
double min_separation_;
ClawTest()
- : claw_queue(".frc971.control_loops.claw_queue", 0x9f1a99dd,
- ".frc971.control_loops.claw_queue.goal",
- ".frc971.control_loops.claw_queue.position",
- ".frc971.control_loops.claw_queue.output",
- ".frc971.control_loops.claw_queue.status"),
+ : claw_queue(".y2014.control_loops.claw_queue", 0x9f1a99dd,
+ ".y2014.control_loops.claw_queue.goal",
+ ".y2014.control_loops.claw_queue.position",
+ ".y2014.control_loops.claw_queue.output",
+ ".y2014.control_loops.claw_queue.status"),
claw_motor_(&claw_queue),
claw_motor_plant_(0.4, 0.2),
min_separation_(constants::GetValues().claw.claw_min_separation) {}
diff --git a/y2014/control_loops/drivetrain/drivetrain_lib_test.cc b/y2014/control_loops/drivetrain/drivetrain_lib_test.cc
index 0769f45..adfc519 100644
--- a/y2014/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/y2014/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -51,11 +51,11 @@
DrivetrainSimulation()
: drivetrain_plant_(
new StateFeedbackPlant<4, 2, 2>(MakeDrivetrainPlant())),
- my_drivetrain_queue_(".frc971.control_loops.drivetrain",
- 0x8a8dde77, ".frc971.control_loops.drivetrain.goal",
- ".frc971.control_loops.drivetrain.position",
- ".frc971.control_loops.drivetrain.output",
- ".frc971.control_loops.drivetrain.status") {
+ my_drivetrain_queue_(".y2014.control_loops.drivetrain",
+ 0x8a8dde77, ".y2014.control_loops.drivetrain.goal",
+ ".y2014.control_loops.drivetrain.position",
+ ".y2014.control_loops.drivetrain.output",
+ ".y2014.control_loops.drivetrain.status") {
Reinitialize();
}
@@ -113,12 +113,12 @@
DrivetrainLoop drivetrain_motor_;
DrivetrainSimulation drivetrain_motor_plant_;
- DrivetrainTest() : my_drivetrain_queue_(".frc971.control_loops.drivetrain",
+ DrivetrainTest() : my_drivetrain_queue_(".y2014.control_loops.drivetrain",
0x8a8dde77,
- ".frc971.control_loops.drivetrain.goal",
- ".frc971.control_loops.drivetrain.position",
- ".frc971.control_loops.drivetrain.output",
- ".frc971.control_loops.drivetrain.status"),
+ ".y2014.control_loops.drivetrain.goal",
+ ".y2014.control_loops.drivetrain.position",
+ ".y2014.control_loops.drivetrain.output",
+ ".y2014.control_loops.drivetrain.status"),
drivetrain_motor_(&my_drivetrain_queue_),
drivetrain_motor_plant_() {
::frc971::sensors::gyro_reading.Clear();
diff --git a/y2014/control_loops/shooter/shooter_lib_test.cc b/y2014/control_loops/shooter/shooter_lib_test.cc
index ce279bb..277352e 100644
--- a/y2014/control_loops/shooter/shooter_lib_test.cc
+++ b/y2014/control_loops/shooter/shooter_lib_test.cc
@@ -44,11 +44,11 @@
brake_piston_state_(true),
brake_delay_count_(0),
shooter_queue_(
- ".frc971.control_loops.shooter_queue", 0xcbf22ba9,
- ".frc971.control_loops.shooter_queue.goal",
- ".frc971.control_loops.shooter_queue.position",
- ".frc971.control_loops.shooter_queue.output",
- ".frc971.control_loops.shooter_queue.status") {
+ ".y2014.control_loops.shooter_queue", 0xcbf22ba9,
+ ".y2014.control_loops.shooter_queue.goal",
+ ".y2014.control_loops.shooter_queue.position",
+ ".y2014.control_loops.shooter_queue.output",
+ ".y2014.control_loops.shooter_queue.status") {
Reinitialize(initial_position);
}
@@ -309,11 +309,11 @@
ShooterTest()
: shooter_queue_(
- ".frc971.control_loops.shooter_queue", 0xcbf22ba9,
- ".frc971.control_loops.shooter_queue.goal",
- ".frc971.control_loops.shooter_queue.position",
- ".frc971.control_loops.shooter_queue.output",
- ".frc971.control_loops.shooter_queue.status"),
+ ".y2014.control_loops.shooter_queue", 0xcbf22ba9,
+ ".y2014.control_loops.shooter_queue.goal",
+ ".y2014.control_loops.shooter_queue.position",
+ ".y2014.control_loops.shooter_queue.output",
+ ".y2014.control_loops.shooter_queue.status"),
shooter_motor_(&shooter_queue_),
shooter_motor_plant_(0.2) {
}
diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index f0e76af..77e478e 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/wpilib/wpilib_interface.cc
@@ -474,8 +474,8 @@
public:
SolenoidWriter(const ::std::unique_ptr<::frc971::wpilib::BufferedPcm> &pcm)
: pcm_(pcm),
- shooter_(".frc971.control_loops.shooter_queue.output"),
- drivetrain_(".frc971.control_loops.drivetrain_queue.output") {}
+ shooter_(".y2014.control_loops.shooter_queue.output"),
+ drivetrain_(".y2014.control_loops.drivetrain_queue.output") {}
void set_pressure_switch(::std::unique_ptr<DigitalInput> pressure_switch) {
pressure_switch_ = ::std::move(pressure_switch);