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

[wpilib,cmd] Rename gamepad shoulder to bumper (#8573)

Browse Source 
Both programs used bumper, so we shouldn't rename it. There's no reason
to change it, and we don't need to match SDL.
This commit is contained in:
Thad House
2026-02-07 10:39:22 -08:00
committed by GitHub
parent 19c61cc419
commit 4aa21e947d
24 changed files with 179 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
View File

@@ -202,37 +202,36 @@ BooleanEvent Gamepad::RightStick(EventLoop* loop) const {
return BooleanEvent(loop, [this]() { return this->GetRightStickButton(); });
}
bool Gamepad::GetLeftShoulderButton() const {
return GetRawButton(Button::kLeftShoulder);
bool Gamepad::GetLeftBumperButton() const {
return GetRawButton(Button::kLeftBumper);
}
bool Gamepad::GetLeftShoulderButtonPressed() {
return GetRawButtonPressed(Button::kLeftShoulder);
bool Gamepad::GetLeftBumperButtonPressed() {
return GetRawButtonPressed(Button::kLeftBumper);
}
bool Gamepad::GetLeftShoulderButtonReleased() {
return GetRawButtonReleased(Button::kLeftShoulder);
bool Gamepad::GetLeftBumperButtonReleased() {
return GetRawButtonReleased(Button::kLeftBumper);
}
BooleanEvent Gamepad::LeftShoulder(EventLoop* loop) const {
return BooleanEvent(loop, [this]() { return this->GetLeftShoulderButton(); });
BooleanEvent Gamepad::LeftBumper(EventLoop* loop) const {
return BooleanEvent(loop, [this]() { return this->GetLeftBumperButton(); });
}
bool Gamepad::GetRightShoulderButton() const {
return GetRawButton(Button::kRightShoulder);
bool Gamepad::GetRightBumperButton() const {
return GetRawButton(Button::kRightBumper);
}
bool Gamepad::GetRightShoulderButtonPressed() {
return GetRawButtonPressed(Button::kRightShoulder);
bool Gamepad::GetRightBumperButtonPressed() {
return GetRawButtonPressed(Button::kRightBumper);
}
bool Gamepad::GetRightShoulderButtonReleased() {
return GetRawButtonReleased(Button::kRightShoulder);
bool Gamepad::GetRightBumperButtonReleased() {
return GetRawButtonReleased(Button::kRightBumper);
}
BooleanEvent Gamepad::RightShoulder(EventLoop* loop) const {
return BooleanEvent(loop,
[this]() { return this->GetRightShoulderButton(); });
BooleanEvent Gamepad::RightBumper(EventLoop* loop) const {
return BooleanEvent(loop, [this]() { return this->GetRightBumperButton(); });
}
bool Gamepad::GetDpadUpButton() const {
@@ -528,11 +527,11 @@ void Gamepad::InitSendable(wpi::util::SendableBuilder& builder) {
"RightStick",
[this] { return GetButtonForSendable(Button::kRightStick); }, nullptr);
builder.AddBooleanProperty(
"LeftShoulder",
[this] { return GetButtonForSendable(Button::kLeftShoulder); }, nullptr);
"LeftBumper",
[this] { return GetButtonForSendable(Button::kLeftBumper); }, nullptr);
builder.AddBooleanProperty(
"RightShoulder",
[this] { return GetButtonForSendable(Button::kRightShoulder); }, nullptr);
"RightBumper",
[this] { return GetButtonForSendable(Button::kRightBumper); }, nullptr);
builder.AddBooleanProperty(
"DpadUp", [this] { return GetButtonForSendable(Button::kDpadUp); },
nullptr);