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 wpilibj GenericHID.getType() (#969)

Browse Source 
It was using array indexing to map the return value of
DriverStation.getJoystickType() to HIDType when the enum should instead be
constructed from the int value. C++ already does this.

Fixes #968.
This commit is contained in:
Tyler Veness
2018-04-29 23:56:00 -07:00
committed by Peter Johnson
parent a8fd88840d
commit e7cf6bf7c5
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java
View File

@@ -8,6 +8,8 @@
package edu.wpi.first.wpilibj;
import edu.wpi.first.wpilibj.hal.HAL;
import java.util.HashMap;
import java.util.Map;
/**
* GenericHID Interface.
@@ -41,10 +43,21 @@ public abstract class GenericHID {
@SuppressWarnings("MemberName")
public final int value;
private static final Map<Integer, HIDType> map = new HashMap<>();
HIDType(int value) {
this.value = value;
}
static {
for (HIDType hidType : HIDType.values()) {
map.put(hidType.value, hidType);
}
}
public static HIDType of(int value) {
return (HIDType) map.get(value);
}
}
/**
@@ -197,7 +210,7 @@ public abstract class GenericHID {
* @return the type of the HID.
*/
public HIDType getType() {
return HIDType.values()[m_ds.getJoystickType(m_port)];
return HIDType.of(m_ds.getJoystickType(m_port));
}
/**