From ecb2add7913755fb75f5610046cc53b739bfbb1b Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Tue, 1 Nov 2016 20:13:26 -0700
Subject: [PATCH] Removes additional references to CANTalon from the library.
 (#312)

---
 hal/include/HAL/Ports.h                           |  1 -
 hal/lib/athena/Ports.cpp                          |  1 -
 hal/lib/athena/PortsInternal.h                    |  1 -
 wpilibc/athena/include/TalonSRX.h                 |  1 -
 wpilibj/src/athena/cpp/lib/PortsJNI.cpp           | 15 ---------------
 .../java/edu/wpi/first/wpilibj/TalonSRX.java      |  2 --
 .../java/edu/wpi/first/wpilibj/hal/PortsJNI.java  |  2 --
 7 files changed, 23 deletions(-)

diff --git a/hal/include/HAL/Ports.h b/hal/include/HAL/Ports.h
index 61861ee275..d114a45522 100644
--- a/hal/include/HAL/Ports.h
+++ b/hal/include/HAL/Ports.h
@@ -31,7 +31,6 @@ int32_t HAL_GetNumPCMModules(void);
 int32_t HAL_GetNumSolenoidChannels(void);
 int32_t HAL_GetNumPDPModules(void);
 int32_t HAL_GetNumPDPChannels(void);
-int32_t HAL_GetNumCanTalons(void);
 #ifdef __cplusplus
 }
 #endif
diff --git a/hal/lib/athena/Ports.cpp b/hal/lib/athena/Ports.cpp
index f1350a94b0..76c1c9cfb6 100644
--- a/hal/lib/athena/Ports.cpp
+++ b/hal/lib/athena/Ports.cpp
@@ -30,5 +30,4 @@ int32_t HAL_GetNumPCMModules(void) { return kNumPCMModules; }
 int32_t HAL_GetNumSolenoidChannels(void) { return kNumSolenoidChannels; }
 int32_t HAL_GetNumPDPModules(void) { return kNumPDPModules; }
 int32_t HAL_GetNumPDPChannels(void) { return kNumPDPChannels; }
-int32_t HAL_GetNumCanTalons(void) { return kNumCanTalons; }
 }
diff --git a/hal/lib/athena/PortsInternal.h b/hal/lib/athena/PortsInternal.h
index d8e8c55b54..28f638a058 100644
--- a/hal/lib/athena/PortsInternal.h
+++ b/hal/lib/athena/PortsInternal.h
@@ -31,5 +31,4 @@ constexpr int32_t kNumPCMModules = 63;
 constexpr int32_t kNumSolenoidChannels = 8;
 constexpr int32_t kNumPDPModules = 63;
 constexpr int32_t kNumPDPChannels = 16;
-constexpr int32_t kNumCanTalons = 63;
 }  // namespace hal
diff --git a/wpilibc/athena/include/TalonSRX.h b/wpilibc/athena/include/TalonSRX.h
index 177710e589..f12ee4d538 100644
--- a/wpilibc/athena/include/TalonSRX.h
+++ b/wpilibc/athena/include/TalonSRX.h
@@ -11,7 +11,6 @@
 
 /**
  * Cross the Road Electronics (CTRE) Talon SRX Speed Controller with PWM control
- * @see CANTalon for CAN control
  */
 class TalonSRX : public PWMSpeedController {
  public:
diff --git a/wpilibj/src/athena/cpp/lib/PortsJNI.cpp b/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
index df587ab9cd..89c63a3ab8 100644
--- a/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
@@ -294,19 +294,4 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPChannels(
   PORTSJNI_LOG(logDEBUG) << "Value = " << value;
   return value;
 }
-
-
-/*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
- * Method:    getNumCanTalons
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumCanTalons(
-    JNIEnv *env, jclass) {
-  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumCanTalons";
-  jint value = HAL_GetNumCanTalons();
-  PORTSJNI_LOG(logDEBUG) << "Value = " << value;
-  return value;
-}
 }
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/TalonSRX.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/TalonSRX.java
index b4be622f4e..9b5f95b485 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/TalonSRX.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/TalonSRX.java
@@ -13,8 +13,6 @@ import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 
 /**
  * Cross the Road Electronics (CTRE) Talon SRX Speed Controller with PWM control.
- *
- * @see CANTalon CANTalon for CAN control of Talon SRX
  */
 public class TalonSRX extends PWMSpeedController {
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/PortsJNI.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/PortsJNI.java
index 352ebb8ac4..5bc9074389 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/PortsJNI.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/PortsJNI.java
@@ -43,6 +43,4 @@ public class PortsJNI extends JNIWrapper {
   public static native int getNumPDPModules();
 
   public static native int getNumPDPChannels();
-
-  public static native int getNumCanTalons();
 }