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

[wpilib] Rename GenericHID and Gamepad enums to all caps

Browse Source 
GenericHID.getSupportedOutputs(): Return EnumSet
Gamepad: Add Button-taking accessors
This commit is contained in:
Peter Johnson
2026-03-17 17:19:58 -07:00
parent d86a745328
commit a57d658ef1
25 changed files with 1266 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

485
wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java
View File

File diff suppressed because it is too large Load Diff

81
wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java
View File

@@ -4,6 +4,7 @@
package org.wpilib.driverstation;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import org.wpilib.driverstation.DriverStation.POVDirection;
@@ -24,39 +25,70 @@ public class GenericHID {
/** Represents a rumble output on the Joystick. */
public enum RumbleType {
/** Left rumble motor. */
kLeftRumble,
LEFT_RUMBLE,
/** Right rumble motor. */
kRightRumble,
RIGHT_RUMBLE,
/** Left trigger rumble motor. */
kLeftTriggerRumble,
LEFT_TRIGGER_RUMBLE,
/** Right trigger rumble motor. */
kRightTriggerRumble,
RIGHT_TRIGGER_RUMBLE,
}
/** Represents the various outputs that a HID may support. */
public enum SupportedOutput {
/// No outputs supported.
NONE(0x0),
/// Mono LED support.
MONO_LED(0x1),
/// RGB LED support.
RGB_LED(0x2),
/// Player LED support.
PLAYER_LED(0x4),
/// Rumble support.
RUMBLE(0x8),
/// Trigger rumble support.
TRIGGER_RUMBLE(0x10);
private final int value;
SupportedOutput(int value) {
this.value = value;
}
/**
* Get the bitfield value of this SupportedOutput.
*
* @return the bitfield value of this SupportedOutput.
*/
public int getValue() {
return value;
}
}
/** USB HID interface type. */
public enum HIDType {
/** Unknown. */
kUnknown(0),
UNKNOWN(0),
/** Standard. */
kStandard(1),
STANDARD(1),
/** Xbox 360. */
kXbox360(2),
XBOX_360(2),
/** Xbox One. */
kXboxOne(3),
XBOX_ONE(3),
/** PS3. */
kPS3(4),
PS3(4),
/** PS4. */
kPS4(5),
PS4(5),
/** PS5. */
kPS5(6),
PS5(6),
/** Switch Pro. */
kSwitchPro(7),
SWITCH_PRO(7),
/** Switch Joycon Left. */
kSwitchJoyconLeft(8),
SWITCH_JOYCON_LEFT(8),
/** Switch Joycon Right. */
kSwitchJoyconRight(9),
SWITCH_JOYCON_RIGHT(9),
/** Switch Joycon Pair. */
kSwitchJoyconPair(10);
SWITCH_JOYCON_PAIR(10);
/** HIDType value. */
public final int value;
@@ -433,8 +465,15 @@ public class GenericHID {
*
* @return the supported outputs for the HID.
*/
public int getSupportedOutputs() {
return DriverStation.getJoystickSupportedOutputs(m_port);
public EnumSet<SupportedOutput> getSupportedOutputs() {
int supported = DriverStation.getJoystickSupportedOutputs(m_port);
EnumSet<SupportedOutput> outputs = EnumSet.noneOf(SupportedOutput.class);
for (SupportedOutput output : SupportedOutput.values()) {
if ((supported & output.getValue()) != 0) {
outputs.add(output);
}
}
return outputs;
}
/**
@@ -479,10 +518,10 @@ public class GenericHID {
value = Math.clamp(value, 0, 1);
int rumbleValue = (int) (value * 65535);
switch (type) {
case kLeftRumble -> this.m_leftRumble = rumbleValue;
case kRightRumble -> this.m_rightRumble = rumbleValue;
case kLeftTriggerRumble -> this.m_leftTriggerRumble = rumbleValue;
case kRightTriggerRumble -> this.m_rightTriggerRumble = rumbleValue;
case LEFT_RUMBLE -> this.m_leftRumble = rumbleValue;
case RIGHT_RUMBLE -> this.m_rightRumble = rumbleValue;
case LEFT_TRIGGER_RUMBLE -> this.m_leftTriggerRumble = rumbleValue;
case RIGHT_TRIGGER_RUMBLE -> this.m_rightTriggerRumble = rumbleValue;
default -> {
// no-op
}

84
wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java
View File

@@ -34,13 +34,33 @@ public class GamepadSim extends GenericHIDSim {
setPOVsMaximumIndex(1);
}
/**
* Set the value of a given button.
*
* @param button the button to set
* @param value the new value
*/
public void setButton(Gamepad.Button button, boolean value) {
setRawButton(button.value, value);
}
/**
* Set the value of a given axis.
*
* @param axis the axis to set
* @param value the new value
*/
public void setAxis(Gamepad.Axis axis, double value) {
setRawAxis(axis.value, value);
}
/**
* Change the left X value of the controller's joystick.
*
* @param value the new value
*/
public void setLeftX(double value) {
setRawAxis(Gamepad.Axis.kLeftX.value, value);
setAxis(Gamepad.Axis.LEFT_X, value);
}
/**
@@ -49,7 +69,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setLeftY(double value) {
setRawAxis(Gamepad.Axis.kLeftY.value, value);
setAxis(Gamepad.Axis.LEFT_Y, value);
}
/**
@@ -58,7 +78,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightX(double value) {
setRawAxis(Gamepad.Axis.kRightX.value, value);
setAxis(Gamepad.Axis.RIGHT_X, value);
}
/**
@@ -67,7 +87,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightY(double value) {
setRawAxis(Gamepad.Axis.kRightY.value, value);
setAxis(Gamepad.Axis.RIGHT_Y, value);
}
/**
@@ -76,7 +96,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setLeftTriggerAxis(double value) {
setRawAxis(Gamepad.Axis.kLeftTrigger.value, value);
setAxis(Gamepad.Axis.LEFT_TRIGGER, value);
}
/**
@@ -85,7 +105,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightTriggerAxis(double value) {
setRawAxis(Gamepad.Axis.kRightTrigger.value, value);
setAxis(Gamepad.Axis.RIGHT_TRIGGER, value);
}
/**
@@ -94,7 +114,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setSouthFaceButton(boolean value) {
setRawButton(Gamepad.Button.kSouthFace.value, value);
setButton(Gamepad.Button.SOUTH_FACE, value);
}
/**
@@ -103,7 +123,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setEastFaceButton(boolean value) {
setRawButton(Gamepad.Button.kEastFace.value, value);
setButton(Gamepad.Button.EAST_FACE, value);
}
/**
@@ -112,7 +132,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setWestFaceButton(boolean value) {
setRawButton(Gamepad.Button.kWestFace.value, value);
setButton(Gamepad.Button.WEST_FACE, value);
}
/**
@@ -121,7 +141,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setNorthFaceButton(boolean value) {
setRawButton(Gamepad.Button.kNorthFace.value, value);
setButton(Gamepad.Button.NORTH_FACE, value);
}
/**
@@ -130,7 +150,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setBackButton(boolean value) {
setRawButton(Gamepad.Button.kBack.value, value);
setButton(Gamepad.Button.BACK, value);
}
/**
@@ -139,7 +159,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setGuideButton(boolean value) {
setRawButton(Gamepad.Button.kGuide.value, value);
setButton(Gamepad.Button.GUIDE, value);
}
/**
@@ -148,7 +168,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setStartButton(boolean value) {
setRawButton(Gamepad.Button.kStart.value, value);
setButton(Gamepad.Button.START, value);
}
/**
@@ -157,7 +177,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setLeftStickButton(boolean value) {
setRawButton(Gamepad.Button.kLeftStick.value, value);
setButton(Gamepad.Button.LEFT_STICK, value);
}
/**
@@ -166,7 +186,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightStickButton(boolean value) {
setRawButton(Gamepad.Button.kRightStick.value, value);
setButton(Gamepad.Button.RIGHT_STICK, value);
}
/**
@@ -175,7 +195,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setLeftBumperButton(boolean value) {
setRawButton(Gamepad.Button.kLeftBumper.value, value);
setButton(Gamepad.Button.LEFT_BUMPER, value);
}
/**
@@ -184,7 +204,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightBumperButton(boolean value) {
setRawButton(Gamepad.Button.kRightBumper.value, value);
setButton(Gamepad.Button.RIGHT_BUMPER, value);
}
/**
@@ -193,7 +213,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setDpadUpButton(boolean value) {
setRawButton(Gamepad.Button.kDpadUp.value, value);
setButton(Gamepad.Button.DPAD_UP, value);
}
/**
@@ -202,7 +222,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setDpadDownButton(boolean value) {
setRawButton(Gamepad.Button.kDpadDown.value, value);
setButton(Gamepad.Button.DPAD_DOWN, value);
}
/**
@@ -211,7 +231,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setDpadLeftButton(boolean value) {
setRawButton(Gamepad.Button.kDpadLeft.value, value);
setButton(Gamepad.Button.DPAD_LEFT, value);
}
/**
@@ -220,7 +240,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setDpadRightButton(boolean value) {
setRawButton(Gamepad.Button.kDpadRight.value, value);
setButton(Gamepad.Button.DPAD_RIGHT, value);
}
/**
@@ -229,7 +249,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setMisc1Button(boolean value) {
setRawButton(Gamepad.Button.kMisc1.value, value);
setButton(Gamepad.Button.MISC_1, value);
}
/**
@@ -238,7 +258,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightPaddle1Button(boolean value) {
setRawButton(Gamepad.Button.kRightPaddle1.value, value);
setButton(Gamepad.Button.RIGHT_PADDLE_1, value);
}
/**
@@ -247,7 +267,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setLeftPaddle1Button(boolean value) {
setRawButton(Gamepad.Button.kLeftPaddle1.value, value);
setButton(Gamepad.Button.LEFT_PADDLE_1, value);
}
/**
@@ -256,7 +276,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setRightPaddle2Button(boolean value) {
setRawButton(Gamepad.Button.kRightPaddle2.value, value);
setButton(Gamepad.Button.RIGHT_PADDLE_2, value);
}
/**
@@ -265,7 +285,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setLeftPaddle2Button(boolean value) {
setRawButton(Gamepad.Button.kLeftPaddle2.value, value);
setButton(Gamepad.Button.LEFT_PADDLE_2, value);
}
/**
@@ -274,7 +294,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setTouchpadButton(boolean value) {
setRawButton(Gamepad.Button.kTouchpad.value, value);
setButton(Gamepad.Button.TOUCHPAD, value);
}
/**
@@ -283,7 +303,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setMisc2Button(boolean value) {
setRawButton(Gamepad.Button.kMisc2.value, value);
setButton(Gamepad.Button.MISC_2, value);
}
/**
@@ -292,7 +312,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setMisc3Button(boolean value) {
setRawButton(Gamepad.Button.kMisc3.value, value);
setButton(Gamepad.Button.MISC_3, value);
}
/**
@@ -301,7 +321,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setMisc4Button(boolean value) {
setRawButton(Gamepad.Button.kMisc4.value, value);
setButton(Gamepad.Button.MISC_4, value);
}
/**
@@ -310,7 +330,7 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setMisc5Button(boolean value) {
setRawButton(Gamepad.Button.kMisc5.value, value);
setButton(Gamepad.Button.MISC_5, value);
}
/**
@@ -319,6 +339,6 @@ public class GamepadSim extends GenericHIDSim {
* @param value the new value
*/
public void setMisc6Button(boolean value) {
setRawButton(Gamepad.Button.kMisc6.value, value);
setButton(Gamepad.Button.MISC_6, value);
}
}

17
wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java
View File

@@ -4,6 +4,7 @@
package org.wpilib.simulation;
import java.util.EnumSet;
import org.wpilib.driverstation.DriverStation;
import org.wpilib.driverstation.GenericHID;
@@ -142,8 +143,12 @@ public class GenericHIDSim {
*
* @param supportedOutputs the new supported outputs
*/
public void setSupportedOutputs(int supportedOutputs) {
DriverStationSim.setJoystickSupportedOutputs(m_port, supportedOutputs);
public void setSupportedOutputs(EnumSet<GenericHID.SupportedOutput> supportedOutputs) {
int supportedOutputsInt = 0;
for (GenericHID.SupportedOutput output : supportedOutputs) {
supportedOutputsInt |= output.getValue();
}
DriverStationSim.setJoystickSupportedOutputs(m_port, supportedOutputsInt);
}
/**
@@ -173,10 +178,10 @@ public class GenericHIDSim {
public double getRumble(GenericHID.RumbleType type) {
int intType =
switch (type) {
case kLeftRumble -> 0;
case kRightRumble -> 1;
case kLeftTriggerRumble -> 2;
case kRightTriggerRumble -> 3;
case LEFT_RUMBLE -> 0;
case RIGHT_RUMBLE -> 1;
case LEFT_TRIGGER_RUMBLE -> 2;
case RIGHT_TRIGGER_RUMBLE -> 3;
};
int value = DriverStationSim.getJoystickRumble(m_port, intType);
return value / 65535.0;