Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public abstract class SelectableOpMode extends OpMode {
private OpMode selectedOpMode;
private final static String[] MESSAGE = {
"Use the d-pad to move the cursor.",
"Press right bumper to select.",
"Press left bumper to go back."
"Press right bumper or d-pad right to select.",
"Press left bumper or d-pad left to go back."
};

public SelectableOpMode(String name, Consumer<SelectScope<Supplier<OpMode>>> opModes) {
Expand Down Expand Up @@ -45,9 +45,15 @@ public final void init_loop() {
selector.decrementSelected();
else if (gamepad1.dpadDownWasPressed() || gamepad2.dpadDownWasPressed())
selector.incrementSelected();
else if (gamepad1.rightBumperWasPressed() || gamepad2.rightBumperWasPressed())
else if (gamepad1.rightBumperWasPressed() ||
gamepad2.rightBumperWasPressed() ||
gamepad1.dpadRightWasPressed() ||
gamepad2.dpadRightWasPressed())
selector.select();
else if (gamepad1.leftBumperWasPressed() || gamepad2.leftBumperWasPressed())
else if (gamepad1.leftBumperWasPressed() ||
gamepad2.leftBumperWasPressed() ||
gamepad1.dpadLeftWasPressed() ||
gamepad2.dpadLeftWasPressed())
selector.goBack();

List<String> lines = selector.getLines();
Expand Down