Add VictorSP back
This is the hardware we're actually using, so Austin pointed out we
should probably we using these constants for this year's code.
Change-Id: Icc11c431e34381824c66d2d474e4e47d1b078f9a
diff --git a/third_party/allwpilib_2017/BUILD b/third_party/allwpilib_2017/BUILD
index 735ef95..610a4bb 100644
--- a/third_party/allwpilib_2017/BUILD
+++ b/third_party/allwpilib_2017/BUILD
@@ -32,7 +32,6 @@
'PIDController',
'Spark',
'Servo',
- 'VictorSP',
'SD540',
'RobotDrive',
'Jaguar',
diff --git a/third_party/allwpilib_2017/wpilibc/athena/include/VictorSP.h b/third_party/allwpilib_2017/wpilibc/athena/include/VictorSP.h
index 539b27b..2061ee4 100644
--- a/third_party/allwpilib_2017/wpilibc/athena/include/VictorSP.h
+++ b/third_party/allwpilib_2017/wpilibc/athena/include/VictorSP.h
@@ -7,14 +7,14 @@
#pragma once
-#include "PWMSpeedController.h"
+#include "PWM.h"
namespace frc {
/**
* Vex Robotics Victor SP Speed Controller
*/
-class VictorSP : public PWMSpeedController {
+class VictorSP : public PWM {
public:
explicit VictorSP(int channel);
virtual ~VictorSP() = default;
diff --git a/third_party/allwpilib_2017/wpilibc/athena/src/VictorSP.cpp b/third_party/allwpilib_2017/wpilibc/athena/src/VictorSP.cpp
index a1335d6..749dcde 100644
--- a/third_party/allwpilib_2017/wpilibc/athena/src/VictorSP.cpp
+++ b/third_party/allwpilib_2017/wpilibc/athena/src/VictorSP.cpp
@@ -8,7 +8,6 @@
#include "VictorSP.h"
#include "HAL/HAL.h"
-#include "LiveWindow/LiveWindow.h"
using namespace frc;
@@ -18,7 +17,7 @@
* @param channel The PWM channel that the VictorSP is attached to. 0-9 are
* on-board, 10-19 are on the MXP port
*/
-VictorSP::VictorSP(int channel) : PWMSpeedController(channel) {
+VictorSP::VictorSP(int channel) : PWM(channel) {
/**
* Note that the VictorSP uses the following bounds for PWM values. These
* values should work reasonably well for most controllers, but if users
@@ -39,5 +38,4 @@
SetZeroLatch();
HAL_Report(HALUsageReporting::kResourceType_VictorSP, GetChannel());
- LiveWindow::GetInstance()->AddActuator("VictorSP", GetChannel(), this);
}