Initial stab at the new WPILib.
Change-Id: Id04cc07649959566deb5b4fa637267072a5191ca
diff --git a/y2014_bot3/wpilib_interface.cc b/y2014_bot3/wpilib_interface.cc
index 83ec9a9..5165ce9 100644
--- a/y2014_bot3/wpilib_interface.cc
+++ b/y2014_bot3/wpilib_interface.cc
@@ -91,12 +91,6 @@
::aos::SetCurrentThreadName("SensorReader");
my_pid_ = getpid();
- ds_ =
-#ifdef WPILIB2015
- DriverStation::GetInstance();
-#else
- &DriverStation::GetInstance();
-#endif
::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
::std::chrono::milliseconds(4));
@@ -114,7 +108,7 @@
}
void RunIteration() {
- ::frc971::wpilib::SendRobotState(my_pid_, ds_);
+ ::frc971::wpilib::SendRobotState(my_pid_);
// Drivetrain
{
@@ -142,7 +136,6 @@
private:
int32_t my_pid_;
- DriverStation *ds_;
::std::unique_ptr<Encoder> drivetrain_left_encoder_;
::std::unique_ptr<Encoder> drivetrain_right_encoder_;