Update wpilib_robot_base to work with new WPILib too
Change-Id: I911cc1eb304c8e33ddd9a60c0ffffe1ef577bcd0
diff --git a/frc971/wpilib/wpilib_robot_base.h b/frc971/wpilib/wpilib_robot_base.h
index 231a21a..50ef970 100644
--- a/frc971/wpilib/wpilib_robot_base.h
+++ b/frc971/wpilib/wpilib_robot_base.h
@@ -1,7 +1,11 @@
#ifndef FRC971_WPILIB_NEWROBOTBASE_H_
#define FRC971_WPILIB_NEWROBOTBASE_H_
+#ifdef WPILIB2015
#include "RobotBase.h"
+#else
+#include "SampleRobot.h"
+#endif
namespace frc971 {
namespace wpilib {
@@ -15,16 +19,23 @@
START_ROBOT_CLASS(::frc971::wpilib::WPILibAdapterRobot<_ClassName_>)
template <typename T>
+#ifdef WPILIB2015
class WPILibAdapterRobot : public RobotBase {
+#else
+class WPILibAdapterRobot : public SampleRobot {
+#endif
public:
+#ifdef WPILIB2015
void StartCompetition() override { robot_.Run(); }
+#else
+ void RobotMain() override { robot_.Run(); }
+#endif
private:
T robot_;
};
-}
-}
+} // namespace wpilib
+} // namespace frc971
-#endif // FRC971_WPILIB_NEWROBOTBASE_H_
-
+#endif // FRC971_WPILIB_NEWROBOTBASE_H_