commit c0cfb13e68a638bcfccbeb97e8ac3e660d209e42
author Campbell Crowley <mail@campbellcrowley.com> Wed Dec 30 20:58:02 2015 -0800
committer Campbell Crowley <mail@campbellcrowley.com> Thu Dec 31 14:56:16 2015 -0800
tree 4da9b374f1bde4a1b27e94827993f98f0e5db611
parent 35df22f1c138aab606df5a147d472f69df0c254d

Created WPILibRobotBase

To not depend on WPILib interfaces and make version changes easier

Change-Id: I90abb34c50798dd166bf7eadf359de5f635f6d82

y2015/wpilib/BUILD

diff --git a/y2015/wpilib/BUILD b/y2015/wpilib/BUILD
index c5c4202..2bd4448 100644
--- a/y2015/wpilib/BUILD
+++ b/y2015/wpilib/BUILD
@@ -30,6 +30,7 @@
     '//frc971/wpilib:dma_edge_counting',
     '//frc971/wpilib:interrupt_edge_counting',
     '//frc971/wpilib:encoder_and_potentiometer',
+    '//frc971/wpilib:wpilib_robot_base',
     '//frc971/control_loops:queues',
     '//frc971/wpilib:logging_queue',
     '//frc971/wpilib:wpilib_interface',

y2015/wpilib/wpilib_interface.cc

diff --git a/y2015/wpilib/wpilib_interface.cc b/y2015/wpilib/wpilib_interface.cc
index 0ea4b8d..8d8b3d3 100644
--- a/y2015/wpilib/wpilib_interface.cc
+++ b/y2015/wpilib/wpilib_interface.cc
@@ -13,7 +13,7 @@
 #include "AnalogInput.h"
 #include "Compressor.h"
 #include "Relay.h"
-#include "RobotBase.h"
+#include "frc971/wpilib/wpilib_robot_base.h"
 #include "dma.h"
 #ifndef WPILIB2015
 #include "DigitalGlitchFilter.h"
@@ -633,13 +633,13 @@
   return std::unique_ptr<T>(new T(std::forward<U>(u)...));
 }
 
-class WPILibRobot : public RobotBase {
+class WPILibRobot : public ::frc971::wpilib::WPILibRobotBase {
  public:
   ::std::unique_ptr<Encoder> encoder(int index) {
     return make_unique<Encoder>(10 + index * 2, 11 + index * 2, false,
                                 Encoder::k4X);
   }
-  virtual void StartCompetition() {
+  virtual void Run() {
     ::aos::InitNRT();
     ::aos::SetCurrentThreadName("StartCompetition");
 
@@ -750,4 +750,4 @@
 }  // namespace frc971
 
 
-START_ROBOT_CLASS(::frc971::wpilib::WPILibRobot);
+AOS_ROBOT_CLASS(::frc971::wpilib::WPILibRobot);