commit 94f51e96711f54085b9e901a467f6cb63ebd06c8
author Austin Schuh <austin.linux@gmail.com> Mon Oct 30 19:25:32 2017 -0700
committer Austin Schuh <austin.linux@gmail.com> Fri Mar 02 21:37:13 2018 -0800
tree 396d2ee1ca9685b8725f7567323e40e6c538c00e
parent 2b1fce0a320c514f591f16647d3382680cd677d1

Initial stab at the new WPILib.

Change-Id: Id04cc07649959566deb5b4fa637267072a5191ca

frc971/wpilib/joystick_sender.cc

diff --git a/frc971/wpilib/joystick_sender.cc b/frc971/wpilib/joystick_sender.cc
index a490e67..7d406d0 100644
--- a/frc971/wpilib/joystick_sender.cc
+++ b/frc971/wpilib/joystick_sender.cc
@@ -6,7 +6,7 @@
 #include "aos/common/logging/queue_logging.h"
 
 #include "DriverStation.h"
-#ifdef WPILIB2017
+#if defined(WPILIB2017) || defined(WPILIB2018)
 #include "HAL/HAL.h"
 #else
 #include "HAL/HAL.hpp"
@@ -31,7 +31,7 @@
     ds->WaitForData();
     auto new_state = ::aos::joystick_state.MakeMessage();
 
-#ifdef WPILIB2017
+#if defined(WPILIB2017) || defined(WPILIB2018)
     HAL_ControlWord control_word;
     HAL_GetControlWord(&control_word);
 #else