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

Fixed bug with joystick buttons/axes out of range.

Browse Source 
Change-Id: I85f0a9f47dfbb786f850c1f382c0e18a4e4b8254
This commit is contained in:
Alex Henning
2014-08-15 10:29:39 -04:00
parent 777dc2113d
commit eded28ebfa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
View File

@@ -161,12 +161,12 @@ public class DriverStation implements RobotState.Interface {
* @return The value of the axis on the joystick.
*/
public double getStickAxis(int stick, int axis) {
if (axis < 1 || axis > kJoystickAxes) {
return 0.0;
}
if (stick < 0 || stick >= joysticks.length || joysticks[stick] == null) {
return 0.0;
}
if (axis < 1 || axis > kJoystickAxes || axis > joysticks[stick].getAxesCount()) {
return 0.0;
}
return joysticks[stick].getAxes(axis - 1);
}
@@ -181,6 +181,9 @@ public class DriverStation implements RobotState.Interface {
if (stick < 0 || stick >= joysticks.length || joysticks[stick] == null) {
return false;
}
if (button < 1 || button > joysticks[stick].getButtonsCount()) {
return false;
}
return joysticks[stick].getButtons(button - 1);
}