Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +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

1
hal/include/HAL/Ports.h
View File

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

1
hal/lib/athena/Ports.cpp
View File

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

1
hal/lib/athena/PortsInternal.h
View File

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

1
wpilibc/athena/include/TalonSRX.h
View File

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

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();
}