mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-03 03:01:44 +00:00
Merge branch 'main' into 2027
This commit is contained in:
@@ -757,8 +757,8 @@ public class PS4Controller extends GenericHID implements Sendable {
|
||||
public void initSendable(SendableBuilder builder) {
|
||||
builder.setSmartDashboardType("HID");
|
||||
builder.publishConstString("ControllerType", "PS4");
|
||||
builder.addDoubleProperty("L2", this::getL2Axis, null);
|
||||
builder.addDoubleProperty("R2", this::getR2Axis, null);
|
||||
builder.addDoubleProperty("L2 Axis", this::getL2Axis, null);
|
||||
builder.addDoubleProperty("R2 Axis", this::getR2Axis, null);
|
||||
builder.addDoubleProperty("LeftX", this::getLeftX, null);
|
||||
builder.addDoubleProperty("LeftY", this::getLeftY, null);
|
||||
builder.addDoubleProperty("RightX", this::getRightX, null);
|
||||
|
||||
@@ -757,8 +757,8 @@ public class PS5Controller extends GenericHID implements Sendable {
|
||||
public void initSendable(SendableBuilder builder) {
|
||||
builder.setSmartDashboardType("HID");
|
||||
builder.publishConstString("ControllerType", "PS5");
|
||||
builder.addDoubleProperty("L2", this::getL2Axis, null);
|
||||
builder.addDoubleProperty("R2", this::getR2Axis, null);
|
||||
builder.addDoubleProperty("L2 Axis", this::getL2Axis, null);
|
||||
builder.addDoubleProperty("R2 Axis", this::getR2Axis, null);
|
||||
builder.addDoubleProperty("LeftX", this::getLeftX, null);
|
||||
builder.addDoubleProperty("LeftY", this::getLeftY, null);
|
||||
builder.addDoubleProperty("RightX", this::getRightX, null);
|
||||
|
||||
@@ -687,8 +687,8 @@ public class XboxController extends GenericHID implements Sendable {
|
||||
public void initSendable(SendableBuilder builder) {
|
||||
builder.setSmartDashboardType("HID");
|
||||
builder.publishConstString("ControllerType", "Xbox");
|
||||
builder.addDoubleProperty("LeftTrigger", this::getLeftTriggerAxis, null);
|
||||
builder.addDoubleProperty("RightTrigger", this::getRightTriggerAxis, null);
|
||||
builder.addDoubleProperty("LeftTrigger Axis", this::getLeftTriggerAxis, null);
|
||||
builder.addDoubleProperty("RightTrigger Axis", this::getRightTriggerAxis, null);
|
||||
builder.addDoubleProperty("LeftX", this::getLeftX, null);
|
||||
builder.addDoubleProperty("RightX", this::getRightX, null);
|
||||
builder.addDoubleProperty("LeftY", this::getLeftY, null);
|
||||
|
||||
Reference in New Issue
Block a user