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

14
wpilibc/src/main/native/cpp/TalonSRX.cpp → wpilibc/src/main/native/cpp/PWMTalonSRX.cpp
View File

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