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

Merge "Make all channel errors throw IndexOutOfBounds"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-09-10 08:57:35 -07:00
committed by Gerrit Code Review
parent e60baf41a9 debf9e0ee9
commit ca9f5a676d
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SensorBase.java
View File

@@ -94,7 +94,7 @@ public abstract class SensorBase { // TODO: Refactor
*/
protected static void checkDigitalChannel(final int channel) {
if (channel < 0 || channel >= kDigitalChannels) {
System.err.println("Requested digital channel number is out of range.");
throw new IndexOutOfBoundsException("Requested digital channel number is out of range.");
}
}
@@ -107,7 +107,6 @@ public abstract class SensorBase { // TODO: Refactor
*/
protected static void checkRelayChannel(final int channel) {
if (channel < 0 || channel >= kRelayChannels) {
System.err.println("Requested relay channel number is out of range.");
throw new IndexOutOfBoundsException("Requested relay channel number is out of range.");
}
}
@@ -121,7 +120,6 @@ public abstract class SensorBase { // TODO: Refactor
*/
protected static void checkPWMChannel(final int channel) {
if (channel < 0 || channel >= kPwmChannels) {
System.err.println("Requested PWM channel number is out of range.");
throw new IndexOutOfBoundsException("Requested PWM channel number is out of range.");
}
}
@@ -134,8 +132,8 @@ public abstract class SensorBase { // TODO: Refactor
* @param channel The channel number to check.
*/
protected static void checkAnalogInputChannel(final int channel) {
if (channel <= 0 || channel > kAnalogInputChannels) {
System.err.println("Requested analog channel number is out of range.");
if (channel < 0 || channel >= kAnalogInputChannels) {
throw new IndexOutOfBoundsException("Requested analog input channel number is out of range.");
}
}
@@ -147,8 +145,8 @@ public abstract class SensorBase { // TODO: Refactor
* @param channel The channel number to check.
*/
protected static void checkAnalogOutputChannel(final int channel) {
if (channel <= 0 || channel > kAnalogOutputChannels) {
System.err.println("Requested analog channel number is out of range.");
if (channel < 0 || channel >= kAnalogOutputChannels) {
throw new IndexOutOfBoundsException("Requested analog output channel number is out of range.");
}
}
@@ -160,7 +158,7 @@ public abstract class SensorBase { // TODO: Refactor
*/
protected static void checkSolenoidChannel(final int channel) {
if (channel < 0 || channel >= kSolenoidChannels) {
System.err.println("Requested solenoid channel number is out of range.");
throw new IndexOutOfBoundsException("Requested solenoid channel number is out of range.");
}
}
@@ -172,7 +170,7 @@ public abstract class SensorBase { // TODO: Refactor
*/
protected static void checkPDPChannel(final int channel) {
if (channel < 0 || channel >= kPDPChannels) {
System.err.println("Requested solenoid channel number is out of range.");
throw new IndexOutOfBoundsException("Requested PDP channel number is out of range.");
}
}