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

Makes SensorBase checks use HAL check methods (#182)

Browse Source
This commit is contained in:
Thad House
2016-07-20 22:47:29 -07:00
committed by Peter Johnson
parent 0901ae0808
commit 512ecf6490
24 changed files with 238 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
wpilibc/sim/src/SensorBase.cpp
View File

@@ -9,34 +9,33 @@
#include "WPIErrors.h"
const uint32_t SensorBase::kDigitalChannels;
const uint32_t SensorBase::kAnalogInputs;
const uint32_t SensorBase::kSolenoidChannels;
const uint32_t SensorBase::kSolenoidModules;
const uint32_t SensorBase::kPwmChannels;
const uint32_t SensorBase::kRelayChannels;
const uint32_t SensorBase::kPDPChannels;
const uint32_t SensorBase::kChassisSlots;
const int SensorBase::kDigitalChannels;
const int SensorBase::kAnalogInputs;
const int SensorBase::kSolenoidChannels;
const int SensorBase::kSolenoidModules;
const int SensorBase::kPwmChannels;
const int SensorBase::kRelayChannels;
const int SensorBase::kPDPChannels;
/**
* Check that the solenoid module number is valid.
*
* @return Solenoid module is valid and present
* @return Solenoid module number is valid
*/
bool SensorBase::CheckSolenoidModule(uint8_t moduleNumber) {
return 1 <= moduleNumber && moduleNumber <= 2; // TODO: Fix for Athena
bool SensorBase::CheckSolenoidModule(int moduleNumber) {
return moduleNumber >= 0 && moduleNumber < kSolenoidModules;
}
/**
* 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
*/
bool SensorBase::CheckDigitalChannel(uint32_t channel) {
if (channel > 0 && channel <= kDigitalChannels) return true;
bool SensorBase::CheckDigitalChannel(int channel) {
if (channel >= 0 && channel < kDigitalChannels) return true;
return false;
}
@@ -44,12 +43,12 @@ bool SensorBase::CheckDigitalChannel(uint32_t channel) {
* 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 Relay channel is valid
*/
bool SensorBase::CheckRelayChannel(uint32_t channel) {
if (channel > 0 && channel <= kRelayChannels) return true;
bool SensorBase::CheckRelayChannel(int channel) {
if (channel >= 0 && channel < kRelayChannels) return true;
return false;
}
@@ -57,12 +56,12 @@ bool SensorBase::CheckRelayChannel(uint32_t channel) {
* 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
*/
bool SensorBase::CheckPWMChannel(uint32_t channel) {
if (channel > 0 && channel <= kPwmChannels) return true;
bool SensorBase::CheckPWMChannel(int channel) {
if (channel >= 0 && channel < kPwmChannels) return true;
return false;
}
@@ -70,12 +69,12 @@ bool SensorBase::CheckPWMChannel(uint32_t channel) {
* Check that the analog input number is valid.
*
* Verify that the analog input number is one of the legal channel numbers.
* Channel numbers are 1-based.
* Channel numbers are 0-based.
*
* @return Analog channel is valid
*/
bool SensorBase::CheckAnalogInput(uint32_t channel) {
if (channel > 0 && channel <= kAnalogInputs) return true;
bool SensorBase::CheckAnalogInput(int channel) {
if (channel >= 0 && channel < kAnalogInputs) return true;
return false;
}
@@ -83,12 +82,12 @@ bool SensorBase::CheckAnalogInput(uint32_t channel) {
* Check that the analog output number is valid.
*
* Verify that the analog output number is one of the legal channel numbers.
* Channel numbers are 1-based.
* Channel numbers are 0-based.
*
* @return Analog channel is valid
*/
bool SensorBase::CheckAnalogOutput(uint32_t channel) {
if (channel > 0 && channel <= kAnalogOutputs) return true;
bool SensorBase::CheckAnalogOutput(int channel) {
if (channel >= 0 && channel < kAnalogOutputs) return true;
return false;
}
@@ -97,8 +96,8 @@ bool SensorBase::CheckAnalogOutput(uint32_t channel) {
*
* @return Solenoid channel is valid
*/
bool SensorBase::CheckSolenoidChannel(uint32_t channel) {
if (channel > 0 && channel <= kSolenoidChannels) return true;
bool SensorBase::CheckSolenoidChannel(int channel) {
if (channel >= 0 && channel < kSolenoidChannels) return true;
return false;
}
@@ -107,7 +106,7 @@ bool SensorBase::CheckSolenoidChannel(uint32_t channel) {
*
* @return PDP channel is valid
*/
bool SensorBase::CheckPDPChannel(uint32_t channel) {
if (channel > 0 && channel <= kPDPChannels) return true;
bool SensorBase::CheckPDPChannel(int channel) {
if (channel >= 0 && channel < kPDPChannels) return true;
return false;
}