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

Fixed minimum number of joystick axes (#696)

Browse Source
This commit is contained in:
Tyler Veness
2017-10-29 17:21:50 -07:00
committed by Peter Johnson
parent efc7770e9b
commit 595b1df380
3 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java
View File

@@ -23,7 +23,6 @@ public class Joystick extends GenericHID {
static final byte kDefaultZAxis = 2;
static final byte kDefaultTwistAxis = 2;
static final byte kDefaultThrottleAxis = 3;
static final byte kMinNumAxes = 4;
/**
* Represents an analog axis on a joystick.
@@ -71,7 +70,7 @@ public class Joystick extends GenericHID {
* Represents an analog axis on a joystick.
*/
private enum Axis {
kX(0), kY(1), kZ(2), kTwist(3), kThrottle(4);
kX(0), kY(1), kZ(2), kTwist(3), kThrottle(4), kNumAxes(5);
@SuppressWarnings("MemberName")
public final int value;
@@ -81,7 +80,7 @@ public class Joystick extends GenericHID {
}
}
private final byte[] m_axes;
private final byte[] m_axes = new byte[Axis.kNumAxes.value];
/**
* Construct an instance of a joystick. The joystick index is the USB port on the drivers
@@ -92,8 +91,6 @@ public class Joystick extends GenericHID {
public Joystick(final int port) {
super(port);
m_axes = new byte[Math.max(getAxisCount(), kMinNumAxes)];
m_axes[Axis.kX.value] = kDefaultXAxis;
m_axes[Axis.kY.value] = kDefaultYAxis;
m_axes[Axis.kZ.value] = kDefaultZAxis;