Added ahal
This is a formatted copy of WPILib's default user-visible C++ API, with
a bit of completely unnecessary functionality stripped out. Most of the
stripping so far is only related to weird threading decisions.
Change-Id: Icbfd949b48cd115561862cb909bcc572aba0e753
diff --git a/frc971/wpilib/wpilib_robot_base.h b/frc971/wpilib/wpilib_robot_base.h
index 50ef970..3deb0e4 100644
--- a/frc971/wpilib/wpilib_robot_base.h
+++ b/frc971/wpilib/wpilib_robot_base.h
@@ -1,11 +1,7 @@
#ifndef FRC971_WPILIB_NEWROBOTBASE_H_
#define FRC971_WPILIB_NEWROBOTBASE_H_
-#ifdef WPILIB2015
-#include "RobotBase.h"
-#else
-#include "SampleRobot.h"
-#endif
+#include "frc971/wpilib/ahal/RobotBase.h"
namespace frc971 {
namespace wpilib {
@@ -19,17 +15,9 @@
START_ROBOT_CLASS(::frc971::wpilib::WPILibAdapterRobot<_ClassName_>)
template <typename T>
-#ifdef WPILIB2015
-class WPILibAdapterRobot : public RobotBase {
-#else
-class WPILibAdapterRobot : public SampleRobot {
-#endif
+class WPILibAdapterRobot : public frc::RobotBase {
public:
-#ifdef WPILIB2015
void StartCompetition() override { robot_.Run(); }
-#else
- void RobotMain() override { robot_.Run(); }
-#endif
private:
T robot_;