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

[hal] Update DS API to new format (#7977)

Browse Source
This commit is contained in:
Thad House
2025-05-16 22:15:14 -07:00
committed by GitHub
parent 1596e2fd7a
commit 231ec348fe
35 changed files with 878 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,24 +47,24 @@ public final class DriverStation {
}
private static class HALJoystickAxesRaw {
public final int[] m_axes;
public final short[] m_axes;
@SuppressWarnings("unused")
public int m_count;
HALJoystickAxesRaw(int count) {
m_axes = new int[count];
m_axes = new short[count];
}
}
private static class HALJoystickPOVs {
public final short[] m_povs;
public final byte[] m_povs;
public int m_count;
HALJoystickPOVs(int count) {
m_povs = new short[count];
m_povs = new byte[count];
for (int i = 0; i < count; i++) {
m_povs[i] = -1;
m_povs[i] = 0;
}
}
}
@@ -779,17 +779,17 @@ public final class DriverStation {
}
/**
* Gets the value of isXbox on a joystick.
* Gets the value of isGamepad on a joystick.
*
* @param stick The joystick port number
* @return A boolean that returns the value of isXbox
* @return A boolean that returns the value of isGamepad
*/
public static boolean getJoystickIsXbox(int stick) {
public static boolean getJoystickIsGamepad(int stick) {
if (stick < 0 || stick >= kJoystickPorts) {
throw new IllegalArgumentException("Joystick index is out of range, should be 0-5");
}
return DriverStationJNI.getJoystickIsXbox((byte) stick) == 1;
return DriverStationJNI.getJoystickIsGamepad((byte) stick) == 1;
}
/**

8
wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java
View File

@@ -411,13 +411,13 @@ public final class DriverStationSim {
}
/**
* Sets the value of isXbox for a joystick.
* Sets the value of isGamepad for a joystick.
*
* @param stick The joystick number
* @param isXbox The value of isXbox
* @param isGamepad The value of isGamepad
*/
public static void setJoystickIsXbox(int stick, boolean isXbox) {
DriverStationDataJNI.setJoystickIsXbox(stick, isXbox);
public static void setJoystickIsGamepad(int stick, boolean isGamepad) {
DriverStationDataJNI.setJoystickIsGamepad(stick, isGamepad);
}
/**