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

Fix SensorUtil issues (#1194)

Browse Source 
C++ PDP was missing module check, and channel check called module.
Java docs said 1 based instead of 0 based.
This commit is contained in:
Thad House
2018-07-28 09:51:49 -07:00
committed by Peter Johnson
parent bbb622aaa6
commit 1d9ed8f458
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wpilibc/src/main/native/include/frc/SensorUtil.h
View File

@@ -15,10 +15,15 @@ namespace frc {
*/
class SensorUtil final {
public:
/**
* Get the number of the default solenoid module.
*
* @return The number of the default solenoid module.
*/
static int GetDefaultSolenoidModule();
/**
* Check that the solenoid module number is valid.
* Check that the solenoid module number is valid. module numbers are 0-based
*
* @return Solenoid module is valid and present
*/
@@ -28,7 +33,7 @@ class SensorUtil final {
* Check that the digital channel number is valid.
*
* Verify that the channel number is one of the legal channel numbers. Channel
* numbers are 1-based.
* numbers are 0-based.
*
* @return Digital channel is valid
*/
@@ -48,7 +53,7 @@ class SensorUtil final {
* Check that the digital channel number is valid.
*
* Verify that the channel number is one of the legal channel numbers. Channel
* numbers are 1-based.
* numbers are 0-based.
*
* @return PWM channel is valid
*/
@@ -88,6 +93,14 @@ class SensorUtil final {
*/
static bool CheckPDPChannel(int channel);
/**
* Verify that the PDP module number is within limits. module numbers are
* 0-based
*
* @return PDP module is valid
*/
static bool CheckPDPModule(int module);
static const int kDigitalChannels;
static const int kAnalogInputs;
static const int kAnalogOutputs;