diff --git a/src/com/stuypulse/stuylib/input/Gamepad.java b/src/com/stuypulse/stuylib/input/Gamepad.java index 7b91368d..e13d96fa 100644 --- a/src/com/stuypulse/stuylib/input/Gamepad.java +++ b/src/com/stuypulse/stuylib/input/Gamepad.java @@ -128,14 +128,14 @@ public boolean getRawRightButton() { return false; } - // Start / Select / Option // - /** @return If the select button is pressed */ - public boolean getRawSelectButton() { + // Alt-Left / Alt-Right // + /** @return If the alt-left button is pressed */ + public boolean getRawAltLeftButton() { return false; } - /** @return If the start button is pressed */ - public boolean getRawStartButton() { + /** @return If the alt-right button is pressed */ + public boolean getRawAltRightButton() { return false; } @@ -334,15 +334,15 @@ public final Trigger getRightButton() { return new Trigger(this::getRawRightButton); } - // Select / Start / Option // - /** @return Trigger that activates with {@link #getRawSelectButton()} */ - public final Trigger getSelectButton() { - return new Trigger(this::getRawSelectButton); + // Alt-Left / Alt-Right // + /** @return Trigger that activates with {@link #getRawAltLeftButton()} */ + public final Trigger getAltLeftButton() { + return new Trigger(this::getRawAltLeftButton); } - /** @return Trigger that activates with {@link #getRawStartButton()} */ - public final Trigger getStartButton() { - return new Trigger(this::getRawStartButton); + /** @return Trigger that activates with {@link #getRawAltRightButton()} */ + public final Trigger getAltRightButton() { + return new Trigger(this::getRawAltRightButton); } // Analog Stick Triggers // @@ -393,9 +393,9 @@ public final void initSendable(SendableBuilder builder) { builder.addBooleanProperty("Face Button Left", this::getRawLeftButton, x -> {}); builder.addBooleanProperty("Face Button Right", this::getRawRightButton, x -> {}); - // Start / Select / Option - builder.addBooleanProperty("Button Select", this::getRawSelectButton, x -> {}); - builder.addBooleanProperty("Button Start", this::getRawStartButton, x -> {}); + // Alt-Left / Alt-Right // + builder.addBooleanProperty("Button Alt Left", this::getRawAltLeftButton, x -> {}); + builder.addBooleanProperty("Button Alt Right", this::getRawAltRightButton, x -> {}); // Analog Stick Buttons builder.addBooleanProperty("Left Stick Button", this::getRawLeftStickButton, x -> {}); diff --git a/src/com/stuypulse/stuylib/input/gamepads/AutoGamepad.java b/src/com/stuypulse/stuylib/input/gamepads/AutoGamepad.java index b6d370bd..fdc9185c 100644 --- a/src/com/stuypulse/stuylib/input/gamepads/AutoGamepad.java +++ b/src/com/stuypulse/stuylib/input/gamepads/AutoGamepad.java @@ -169,13 +169,13 @@ public boolean getRawTopButton() { return getDetectedGamepad().getRawTopButton(); } - // Start / Select // - public boolean getRawSelectButton() { - return getDetectedGamepad().getRawSelectButton(); + // Alt-Left / Alt-Right // + public boolean getRawAltLeftButton() { + return getDetectedGamepad().getRawAltLeftButton(); } - public boolean getRawStartButton() { - return getDetectedGamepad().getRawStartButton(); + public boolean getRawAltRightButton() { + return getDetectedGamepad().getRawAltRightButton(); } // Analog Stick Buttons // diff --git a/src/com/stuypulse/stuylib/input/gamepads/Logitech.java b/src/com/stuypulse/stuylib/input/gamepads/Logitech.java index 454e95ec..4d1ee4d6 100644 --- a/src/com/stuypulse/stuylib/input/gamepads/Logitech.java +++ b/src/com/stuypulse/stuylib/input/gamepads/Logitech.java @@ -132,14 +132,14 @@ public boolean getRawTopButton() { return getRawButton(4); } - // Start / Select // + // Alt-Left / Alt-Right // @Override - public boolean getRawSelectButton() { + public boolean getRawAltLeftButton() { return getRawButton(9); } @Override - public boolean getRawStartButton() { + public boolean getRawAltRightButton() { return getRawButton(10); } diff --git a/src/com/stuypulse/stuylib/input/gamepads/PS4.java b/src/com/stuypulse/stuylib/input/gamepads/PS4.java index 5296a977..13e324a5 100644 --- a/src/com/stuypulse/stuylib/input/gamepads/PS4.java +++ b/src/com/stuypulse/stuylib/input/gamepads/PS4.java @@ -116,14 +116,14 @@ public boolean getRawTopButton() { return getRawButton(4); } - // Start / Select // + // Alt-Left / Alt-Right // @Override - public boolean getRawSelectButton() { + public boolean getRawAltLeftButton() { return getRawButton(9); } @Override - public boolean getRawStartButton() { + public boolean getRawAltRightButton() { return getRawButton(10); } diff --git a/src/com/stuypulse/stuylib/input/gamepads/Xbox.java b/src/com/stuypulse/stuylib/input/gamepads/Xbox.java index 42a2abaf..ff6b8833 100644 --- a/src/com/stuypulse/stuylib/input/gamepads/Xbox.java +++ b/src/com/stuypulse/stuylib/input/gamepads/Xbox.java @@ -132,14 +132,14 @@ public boolean getRawTopButton() { return getJoystick().getYButton(); } - // Start / Select // + // Alt-Left / Alt-Right // @Override - public boolean getRawSelectButton() { + public boolean getRawAltLeftButton() { return getJoystick().getBackButton(); } @Override - public boolean getRawStartButton() { + public boolean getRawAltRightButton() { return getJoystick().getStartButton(); }