Changes TalonSRX to PWMTalonSRX in wpilibj and wpilibc. (#656)

Also brings the java kResourceType list up-to-date with the cpp list.

wpilibc/src/main/native/cpp/PWMTalonSRX.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "TalonSRX.h"
+#include "PWMTalonSRX.h"
 
 #include <HAL/HAL.h>
 
@@ -14,13 +14,13 @@
 using namespace frc;
 
 /**
- * Construct a TalonSRX connected via PWM.
+ * Construct a PWMTalonSRX connected via PWM.
  *
- * @param channel The PWM channel that the TalonSRX is attached to. 0-9 are
+ * @param channel The PWM channel that the PWMTalonSRX is attached to. 0-9 are
  *                on-board, 10-19 are on the MXP port
  */
-TalonSRX::TalonSRX(int channel) : PWMSpeedController(channel) {
-  /* Note that the TalonSRX uses the following bounds for PWM values. These
+PWMTalonSRX::PWMTalonSRX(int channel) : PWMSpeedController(channel) {
+  /* Note that the PWMTalonSRX uses the following bounds for PWM values. These
    * values should work reasonably well for most controllers, but if users
    * experience issues such as asymmetric behavior around the deadband or
    * inability to saturate the controller in either direction, calibration is
@@ -37,6 +37,6 @@ TalonSRX::TalonSRX(int channel) : PWMSpeedController(channel) {
   SetSpeed(0.0);
   SetZeroLatch();
 
-  HAL_Report(HALUsageReporting::kResourceType_TalonSRX, GetChannel());
-  LiveWindow::GetInstance()->AddActuator("TalonSRX", GetChannel(), this);
+  HAL_Report(HALUsageReporting::kResourceType_PWMTalonSRX, GetChannel());
+  LiveWindow::GetInstance()->AddActuator("PWMTalonSRX", GetChannel(), this);
 }

wpilibc/src/main/native/include/PWMTalonSRX.h

@@ -14,10 +14,10 @@ namespace frc {
 /**
  * Cross the Road Electronics (CTRE) Talon SRX Speed Controller with PWM control
  */
-class TalonSRX : public PWMSpeedController {
+class PWMTalonSRX : public PWMSpeedController {
  public:
-  explicit TalonSRX(int channel);
-  virtual ~TalonSRX() = default;
+  explicit PWMTalonSRX(int channel);
+  virtual ~PWMTalonSRX() = default;
 };
 
 }  // namespace frc

wpilibc/src/main/native/include/WPILib.h

@@ -61,6 +61,7 @@
 #include "PIDSource.h"
 #include "PWM.h"
 #include "PWMSpeedController.h"
+#include "PWMTalonSRX.h"
 #include "PowerDistributionPanel.h"
 #include "Preferences.h"
 #include "Relay.h"
@@ -78,7 +79,6 @@
 #include "Spark.h"
 #include "SpeedController.h"
 #include "Talon.h"
-#include "TalonSRX.h"
 #include "Threads.h"
 #include "TimedRobot.h"
 #include "Timer.h"