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

Merge "Fix joystick issues [artf3707]"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-10-22 10:44:55 -07:00
committed by Gerrit Code Review
parent 261b1857cd a56c0eb4af
commit 455654a95b
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
View File

@@ -57,8 +57,8 @@ public class DriverStation implements RobotState.Interface {
private HALControlWord m_controlWord;
private HALAllianceStationID m_allianceStationID;
private short[][] m_joystickAxes = new short[FRCNetworkCommunicationsLibrary.kMaxJoystickAxes][kJoystickPorts];
private short[][] m_joystickPOVs = new short[FRCNetworkCommunicationsLibrary.kMaxJoystickPOVs][kJoystickPorts];
private short[][] m_joystickAxes = new short[kJoystickPorts][FRCNetworkCommunicationsLibrary.kMaxJoystickAxes];
private short[][] m_joystickPOVs = new short[kJoystickPorts][FRCNetworkCommunicationsLibrary.kMaxJoystickPOVs];
private int[] m_joystickButtons = new int[kJoystickPorts];
private Thread m_thread;
@@ -226,11 +226,11 @@ public class DriverStation implements RobotState.Interface {
throw new RuntimeException("Joystick index is out of range, should be 0-3");
}
if (axis < 1 || axis > m_joystickAxes[stick].length) {
if (axis < 0 || axis >= m_joystickAxes[stick].length) {
throw new RuntimeException("Joystick axis is out of range");
}
byte value = (byte)m_joystickAxes[stick][axis - 1];
byte value = (byte)m_joystickAxes[stick][axis];
if(value < 0) {
return value / 128.0;
@@ -249,11 +249,11 @@ public class DriverStation implements RobotState.Interface {
throw new RuntimeException("Joystick index is out of range, should be 0-3");
}
if (pov < 1 || pov > m_joystickPOVs[stick].length) {
if (pov < 0 || pov >= m_joystickPOVs[stick].length) {
throw new RuntimeException("Joystick POV is out of range");
}
return m_joystickPOVs[stick][pov - 1];
return m_joystickPOVs[stick][pov];
}
/**

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

@@ -17,11 +17,11 @@ import edu.wpi.first.wpilibj.communication.UsageReporting;
*/
public class Joystick extends GenericHID {
static final byte kDefaultXAxis = 1;
static final byte kDefaultYAxis = 2;
static final byte kDefaultZAxis = 3;
static final byte kDefaultTwistAxis = 3;
static final byte kDefaultThrottleAxis = 4;
static final byte kDefaultXAxis = 0;
static final byte kDefaultYAxis = 1;
static final byte kDefaultZAxis = 2;
static final byte kDefaultTwistAxis = 2;
static final byte kDefaultThrottleAxis = 3;
static final int kDefaultTriggerButton = 1;
static final int kDefaultTopButton = 2;
@@ -198,7 +198,7 @@ public class Joystick extends GenericHID {
/**
* Get the value of the axis.
*
* @param axis The axis to read [1-6].
* @param axis The axis to read, starting at 0.
* @return The value of the axis.
*/
public double getRawAxis(final int axis) {