Move PDP values out to a separate queue so the timestamps make sense etc
Change-Id: Iad5303c3446dc29f339f02af9c9c99dd7c75d8e0
diff --git a/y2014_bot3/wpilib/wpilib_interface.cc b/y2014_bot3/wpilib/wpilib_interface.cc
index dc3999f..a3e0c27 100644
--- a/y2014_bot3/wpilib/wpilib_interface.cc
+++ b/y2014_bot3/wpilib/wpilib_interface.cc
@@ -74,8 +74,7 @@
// Reads in our inputs. (sensors, voltages, etc.)
class SensorReader {
public:
- SensorReader(::frc971::wpilib::PDPFetcher *pdp_fetcher)
- : pdp_fetcher_(pdp_fetcher) {}
+ SensorReader() {}
void set_drivetrain_left_encoder(::std::unique_ptr<Encoder> encoder) {
drivetrain_left_encoder_ = ::std::move(encoder);
@@ -114,7 +113,7 @@
}
void RunIteration() {
- ::frc971::wpilib::SendRobotState(my_pid_, ds_, pdp_fetcher_);
+ ::frc971::wpilib::SendRobotState(my_pid_, ds_);
// Drivetrain
{
@@ -143,7 +142,6 @@
private:
int32_t my_pid_;
DriverStation *ds_;
- ::frc971::wpilib::PDPFetcher *const pdp_fetcher_;
::std::unique_ptr<Encoder> drivetrain_left_encoder_;
::std::unique_ptr<Encoder> drivetrain_right_encoder_;
@@ -364,7 +362,7 @@
// the robot before turning on.
// Sensors
- SensorReader reader(&pdp_fetcher);
+ SensorReader reader;
reader.set_drivetrain_left_encoder(make_encoder(4));
reader.set_drivetrain_right_encoder(make_encoder(5));