Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes additional references to CANTalon from the library. (#312)

Browse Source
This commit is contained in:
Thad House
2016-11-01 20:13:26 -07:00
committed by Peter Johnson
parent 9bbdaf300b
commit ecb2add791
7 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibj/src/athena/cpp/lib/PortsJNI.cpp
View File

@@ -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;
}
}

2
wpilibj/src/athena/java/edu/wpi/first/wpilibj/TalonSRX.java
View File

@@ -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 {

2
wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/PortsJNI.java
View File

@@ -43,6 +43,4 @@ public class PortsJNI extends JNIWrapper {
public static native int getNumPDPModules();
public static native int getNumPDPChannels();
public static native int getNumCanTalons();
}