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

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

Browse Source 
Also brings the java kResourceType list up-to-date with the cpp list.
This commit is contained in:
Jacob Caporuscio
2017-10-11 15:01:50 -04:00
committed by Peter Johnson
parent 79919a5f1c
commit ba3a85d0cc
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/include/TalonSRX.h → wpilibc/src/main/native/include/PWMTalonSRX.h
View File

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

2
wpilibc/src/main/native/include/WPILib.h
View File

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