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] 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

79
commandsv2/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp
View File

@@ -4,6 +4,8 @@
#include "wpi/commands2/button/CommandGamepad.hpp"
#include "wpi/commands2/button/CommandGenericHID.hpp"
using namespace wpi::cmd;
CommandGamepad::CommandGamepad(int port)
@@ -13,108 +15,113 @@ wpi::Gamepad& CommandGamepad::GetHID() {
return m_hid;
}
Trigger CommandGamepad::Button(enum wpi::Gamepad::Button button,
wpi::EventLoop* loop) const {
return CommandGenericHID::Button(static_cast<int>(button), loop);
}
Trigger CommandGamepad::SouthFace(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kSouthFace, loop);
return Button(wpi::Gamepad::Button::SOUTH_FACE, loop);
}
Trigger CommandGamepad::EastFace(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kEastFace, loop);
return Button(wpi::Gamepad::Button::EAST_FACE, loop);
}
Trigger CommandGamepad::WestFace(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kWestFace, loop);
return Button(wpi::Gamepad::Button::WEST_FACE, loop);
}
Trigger CommandGamepad::NorthFace(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kNorthFace, loop);
return Button(wpi::Gamepad::Button::NORTH_FACE, loop);
}
Trigger CommandGamepad::Back(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kBack, loop);
return Button(wpi::Gamepad::Button::BACK, loop);
}
Trigger CommandGamepad::Guide(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kGuide, loop);
return Button(wpi::Gamepad::Button::GUIDE, loop);
}
Trigger CommandGamepad::Start(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kStart, loop);
return Button(wpi::Gamepad::Button::START, loop);
}
Trigger CommandGamepad::LeftStick(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kLeftStick, loop);
return Button(wpi::Gamepad::Button::LEFT_STICK, loop);
}
Trigger CommandGamepad::RightStick(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kRightStick, loop);
return Button(wpi::Gamepad::Button::RIGHT_STICK, loop);
}
Trigger CommandGamepad::LeftBumper(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kLeftBumper, loop);
return Button(wpi::Gamepad::Button::LEFT_BUMPER, loop);
}
Trigger CommandGamepad::RightBumper(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kRightBumper, loop);
return Button(wpi::Gamepad::Button::RIGHT_BUMPER, loop);
}
Trigger CommandGamepad::DpadUp(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kDpadUp, loop);
return Button(wpi::Gamepad::Button::DPAD_UP, loop);
}
Trigger CommandGamepad::DpadDown(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kDpadDown, loop);
return Button(wpi::Gamepad::Button::DPAD_DOWN, loop);
}
Trigger CommandGamepad::DpadLeft(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kDpadLeft, loop);
return Button(wpi::Gamepad::Button::DPAD_LEFT, loop);
}
Trigger CommandGamepad::DpadRight(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kDpadRight, loop);
return Button(wpi::Gamepad::Button::DPAD_RIGHT, loop);
}
Trigger CommandGamepad::Misc1(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kMisc1, loop);
return Button(wpi::Gamepad::Button::MISC_1, loop);
}
Trigger CommandGamepad::RightPaddle1(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kRightPaddle1, loop);
return Button(wpi::Gamepad::Button::RIGHT_PADDLE_1, loop);
}
Trigger CommandGamepad::LeftPaddle1(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kLeftPaddle1, loop);
return Button(wpi::Gamepad::Button::LEFT_PADDLE_1, loop);
}
Trigger CommandGamepad::RightPaddle2(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kRightPaddle2, loop);
return Button(wpi::Gamepad::Button::RIGHT_PADDLE_2, loop);
}
Trigger CommandGamepad::LeftPaddle2(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kLeftPaddle2, loop);
return Button(wpi::Gamepad::Button::LEFT_PADDLE_2, loop);
}
Trigger CommandGamepad::Touchpad(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kTouchpad, loop);
return Button(wpi::Gamepad::Button::TOUCHPAD, loop);
}
Trigger CommandGamepad::Misc2(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kMisc2, loop);
return Button(wpi::Gamepad::Button::MISC_2, loop);
}
Trigger CommandGamepad::Misc3(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kMisc3, loop);
return Button(wpi::Gamepad::Button::MISC_3, loop);
}
Trigger CommandGamepad::Misc4(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kMisc4, loop);
return Button(wpi::Gamepad::Button::MISC_4, loop);
}
Trigger CommandGamepad::Misc5(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kMisc5, loop);
return Button(wpi::Gamepad::Button::MISC_5, loop);
}
Trigger CommandGamepad::Misc6(wpi::EventLoop* loop) const {
return Button(wpi::Gamepad::Button::kMisc6, loop);
return Button(wpi::Gamepad::Button::MISC_6, loop);
}
Trigger CommandGamepad::LeftTrigger(double threshold,
@@ -131,6 +138,26 @@ Trigger CommandGamepad::RightTrigger(double threshold,
});
}
Trigger CommandGamepad::AxisLessThan(wpi::Gamepad::Axis axis, double threshold,
wpi::EventLoop* loop) const {
return CommandGenericHID::AxisLessThan(static_cast<int>(axis), threshold,
loop);
}
Trigger CommandGamepad::AxisGreaterThan(wpi::Gamepad::Axis axis,
double threshold,
wpi::EventLoop* loop) const {
return CommandGenericHID::AxisGreaterThan(static_cast<int>(axis), threshold,
loop);
}
Trigger CommandGamepad::AxisMagnitudeGreaterThan(wpi::Gamepad::Axis axis,
double threshold,
wpi::EventLoop* loop) const {
return CommandGenericHID::AxisMagnitudeGreaterThan(static_cast<int>(axis),
threshold, loop);
}
double CommandGamepad::GetLeftX() const {
return m_hid.GetLeftX();
}