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] Prefix all NI DS specific controller classes (#8596)

Browse Source 
Easier then the last one that put everything in a sub namespace. By
prefixing the name less things break, and intellisense will be less
confusing to new users during the transition.
This commit is contained in:
Thad House
2026-02-06 21:36:01 -08:00
committed by GitHub
parent 77b2f9802e
commit 5c5d5222f4
133 changed files with 1959 additions and 2682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java → commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandNiDsPS4Controller.java generated
View File

@@ -8,17 +8,17 @@ package org.wpilib.command3.button;
import org.wpilib.command3.Scheduler;
import org.wpilib.command3.Trigger;
import org.wpilib.driverstation.PS4Controller;
import org.wpilib.driverstation.NiDsPS4Controller;
import org.wpilib.event.EventLoop;
/**
* A version of {@link PS4Controller} with {@link Trigger} factories for command-based.
* A version of {@link NiDsPS4Controller} with {@link Trigger} factories for command-based.
*
* @see PS4Controller
* @see NiDsPS4Controller
*/
@SuppressWarnings("MethodName")
public class CommandPS4Controller extends CommandGenericHID {
private final PS4Controller m_hid;
public class CommandNiDsPS4Controller extends CommandGenericHID {
private final NiDsPS4Controller m_hid;
/**
* Construct an instance of a controller. Commands bound to buttons on the controller will be
@@ -26,9 +26,9 @@ public class CommandPS4Controller extends CommandGenericHID {
*
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandPS4Controller(int port) {
public CommandNiDsPS4Controller(int port) {
super(port);
m_hid = new PS4Controller(port);
m_hid = new NiDsPS4Controller(port);
}
/**
@@ -38,9 +38,9 @@ public class CommandPS4Controller extends CommandGenericHID {
* @param scheduler The scheduler that should execute the triggered commands.
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandPS4Controller(Scheduler scheduler, int port) {
public CommandNiDsPS4Controller(Scheduler scheduler, int port) {
super(scheduler, port);
m_hid = new PS4Controller(port);
m_hid = new NiDsPS4Controller(port);
}
/**
@@ -49,7 +49,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* @return the wrapped GenericHID object
*/
@Override
public PS4Controller getHID() {
public NiDsPS4Controller getHID() {
return m_hid;
}
@@ -74,7 +74,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger square(EventLoop loop) {
return button(PS4Controller.Button.kSquare.value, loop);
return button(NiDsPS4Controller.Button.kSquare.value, loop);
}
/**
@@ -98,7 +98,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger cross(EventLoop loop) {
return button(PS4Controller.Button.kCross.value, loop);
return button(NiDsPS4Controller.Button.kCross.value, loop);
}
/**
@@ -122,7 +122,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger circle(EventLoop loop) {
return button(PS4Controller.Button.kCircle.value, loop);
return button(NiDsPS4Controller.Button.kCircle.value, loop);
}
/**
@@ -146,7 +146,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger triangle(EventLoop loop) {
return button(PS4Controller.Button.kTriangle.value, loop);
return button(NiDsPS4Controller.Button.kTriangle.value, loop);
}
/**
@@ -170,7 +170,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger L1(EventLoop loop) {
return button(PS4Controller.Button.kL1.value, loop);
return button(NiDsPS4Controller.Button.kL1.value, loop);
}
/**
@@ -194,7 +194,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger R1(EventLoop loop) {
return button(PS4Controller.Button.kR1.value, loop);
return button(NiDsPS4Controller.Button.kR1.value, loop);
}
/**
@@ -218,7 +218,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger L2(EventLoop loop) {
return button(PS4Controller.Button.kL2.value, loop);
return button(NiDsPS4Controller.Button.kL2.value, loop);
}
/**
@@ -242,7 +242,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger R2(EventLoop loop) {
return button(PS4Controller.Button.kR2.value, loop);
return button(NiDsPS4Controller.Button.kR2.value, loop);
}
/**
@@ -266,7 +266,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger share(EventLoop loop) {
return button(PS4Controller.Button.kShare.value, loop);
return button(NiDsPS4Controller.Button.kShare.value, loop);
}
/**
@@ -290,7 +290,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger options(EventLoop loop) {
return button(PS4Controller.Button.kOptions.value, loop);
return button(NiDsPS4Controller.Button.kOptions.value, loop);
}
/**
@@ -314,7 +314,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger L3(EventLoop loop) {
return button(PS4Controller.Button.kL3.value, loop);
return button(NiDsPS4Controller.Button.kL3.value, loop);
}
/**
@@ -338,7 +338,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger R3(EventLoop loop) {
return button(PS4Controller.Button.kR3.value, loop);
return button(NiDsPS4Controller.Button.kR3.value, loop);
}
/**
@@ -362,7 +362,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger PS(EventLoop loop) {
return button(PS4Controller.Button.kPS.value, loop);
return button(NiDsPS4Controller.Button.kPS.value, loop);
}
/**
@@ -386,7 +386,7 @@ public class CommandPS4Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger touchpad(EventLoop loop) {
return button(PS4Controller.Button.kTouchpad.value, loop);
return button(NiDsPS4Controller.Button.kTouchpad.value, loop);
}
/**

48
commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java → commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandNiDsPS5Controller.java generated
View File

@@ -8,17 +8,17 @@ package org.wpilib.command3.button;
import org.wpilib.command3.Scheduler;
import org.wpilib.command3.Trigger;
import org.wpilib.driverstation.PS5Controller;
import org.wpilib.driverstation.NiDsPS5Controller;
import org.wpilib.event.EventLoop;
/**
* A version of {@link PS5Controller} with {@link Trigger} factories for command-based.
* A version of {@link NiDsPS5Controller} with {@link Trigger} factories for command-based.
*
* @see PS5Controller
* @see NiDsPS5Controller
*/
@SuppressWarnings("MethodName")
public class CommandPS5Controller extends CommandGenericHID {
private final PS5Controller m_hid;
public class CommandNiDsPS5Controller extends CommandGenericHID {
private final NiDsPS5Controller m_hid;
/**
* Construct an instance of a controller. Commands bound to buttons on the controller will be
@@ -26,9 +26,9 @@ public class CommandPS5Controller extends CommandGenericHID {
*
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandPS5Controller(int port) {
public CommandNiDsPS5Controller(int port) {
super(port);
m_hid = new PS5Controller(port);
m_hid = new NiDsPS5Controller(port);
}
/**
@@ -38,9 +38,9 @@ public class CommandPS5Controller extends CommandGenericHID {
* @param scheduler The scheduler that should execute the triggered commands.
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandPS5Controller(Scheduler scheduler, int port) {
public CommandNiDsPS5Controller(Scheduler scheduler, int port) {
super(scheduler, port);
m_hid = new PS5Controller(port);
m_hid = new NiDsPS5Controller(port);
}
/**
@@ -49,7 +49,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* @return the wrapped GenericHID object
*/
@Override
public PS5Controller getHID() {
public NiDsPS5Controller getHID() {
return m_hid;
}
@@ -74,7 +74,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger square(EventLoop loop) {
return button(PS5Controller.Button.kSquare.value, loop);
return button(NiDsPS5Controller.Button.kSquare.value, loop);
}
/**
@@ -98,7 +98,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger cross(EventLoop loop) {
return button(PS5Controller.Button.kCross.value, loop);
return button(NiDsPS5Controller.Button.kCross.value, loop);
}
/**
@@ -122,7 +122,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger circle(EventLoop loop) {
return button(PS5Controller.Button.kCircle.value, loop);
return button(NiDsPS5Controller.Button.kCircle.value, loop);
}
/**
@@ -146,7 +146,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger triangle(EventLoop loop) {
return button(PS5Controller.Button.kTriangle.value, loop);
return button(NiDsPS5Controller.Button.kTriangle.value, loop);
}
/**
@@ -170,7 +170,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger L1(EventLoop loop) {
return button(PS5Controller.Button.kL1.value, loop);
return button(NiDsPS5Controller.Button.kL1.value, loop);
}
/**
@@ -194,7 +194,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger R1(EventLoop loop) {
return button(PS5Controller.Button.kR1.value, loop);
return button(NiDsPS5Controller.Button.kR1.value, loop);
}
/**
@@ -218,7 +218,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger L2(EventLoop loop) {
return button(PS5Controller.Button.kL2.value, loop);
return button(NiDsPS5Controller.Button.kL2.value, loop);
}
/**
@@ -242,7 +242,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger R2(EventLoop loop) {
return button(PS5Controller.Button.kR2.value, loop);
return button(NiDsPS5Controller.Button.kR2.value, loop);
}
/**
@@ -266,7 +266,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger create(EventLoop loop) {
return button(PS5Controller.Button.kCreate.value, loop);
return button(NiDsPS5Controller.Button.kCreate.value, loop);
}
/**
@@ -290,7 +290,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger options(EventLoop loop) {
return button(PS5Controller.Button.kOptions.value, loop);
return button(NiDsPS5Controller.Button.kOptions.value, loop);
}
/**
@@ -314,7 +314,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger L3(EventLoop loop) {
return button(PS5Controller.Button.kL3.value, loop);
return button(NiDsPS5Controller.Button.kL3.value, loop);
}
/**
@@ -338,7 +338,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger R3(EventLoop loop) {
return button(PS5Controller.Button.kR3.value, loop);
return button(NiDsPS5Controller.Button.kR3.value, loop);
}
/**
@@ -362,7 +362,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger PS(EventLoop loop) {
return button(PS5Controller.Button.kPS.value, loop);
return button(NiDsPS5Controller.Button.kPS.value, loop);
}
/**
@@ -386,7 +386,7 @@ public class CommandPS5Controller extends CommandGenericHID {
* to the given loop.
*/
public Trigger touchpad(EventLoop loop) {
return button(PS5Controller.Button.kTouchpad.value, loop);
return button(NiDsPS5Controller.Button.kTouchpad.value, loop);
}
/**

50
commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java → commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandNiDsStadiaController.java generated
View File

@@ -8,17 +8,17 @@ package org.wpilib.command3.button;
import org.wpilib.command3.Scheduler;
import org.wpilib.command3.Trigger;
import org.wpilib.driverstation.StadiaController;
import org.wpilib.driverstation.NiDsStadiaController;
import org.wpilib.event.EventLoop;
/**
* A version of {@link StadiaController} with {@link Trigger} factories for command-based.
* A version of {@link NiDsStadiaController} with {@link Trigger} factories for command-based.
*
* @see StadiaController
* @see NiDsStadiaController
*/
@SuppressWarnings("MethodName")
public class CommandStadiaController extends CommandGenericHID {
private final StadiaController m_hid;
public class CommandNiDsStadiaController extends CommandGenericHID {
private final NiDsStadiaController m_hid;
/**
* Construct an instance of a controller. Commands bound to buttons on the controller will be
@@ -26,9 +26,9 @@ public class CommandStadiaController extends CommandGenericHID {
*
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandStadiaController(int port) {
public CommandNiDsStadiaController(int port) {
super(port);
m_hid = new StadiaController(port);
m_hid = new NiDsStadiaController(port);
}
/**
@@ -38,9 +38,9 @@ public class CommandStadiaController extends CommandGenericHID {
* @param scheduler The scheduler that should execute the triggered commands.
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandStadiaController(Scheduler scheduler, int port) {
public CommandNiDsStadiaController(Scheduler scheduler, int port) {
super(scheduler, port);
m_hid = new StadiaController(port);
m_hid = new NiDsStadiaController(port);
}
/**
@@ -49,7 +49,7 @@ public class CommandStadiaController extends CommandGenericHID {
* @return the wrapped GenericHID object
*/
@Override
public StadiaController getHID() {
public NiDsStadiaController getHID() {
return m_hid;
}
@@ -74,7 +74,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger a(EventLoop loop) {
return button(StadiaController.Button.kA.value, loop);
return button(NiDsStadiaController.Button.kA.value, loop);
}
/**
@@ -98,7 +98,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger b(EventLoop loop) {
return button(StadiaController.Button.kB.value, loop);
return button(NiDsStadiaController.Button.kB.value, loop);
}
/**
@@ -122,7 +122,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger x(EventLoop loop) {
return button(StadiaController.Button.kX.value, loop);
return button(NiDsStadiaController.Button.kX.value, loop);
}
/**
@@ -146,7 +146,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger y(EventLoop loop) {
return button(StadiaController.Button.kY.value, loop);
return button(NiDsStadiaController.Button.kY.value, loop);
}
/**
@@ -170,7 +170,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger leftBumper(EventLoop loop) {
return button(StadiaController.Button.kLeftBumper.value, loop);
return button(NiDsStadiaController.Button.kLeftBumper.value, loop);
}
/**
@@ -194,7 +194,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger rightBumper(EventLoop loop) {
return button(StadiaController.Button.kRightBumper.value, loop);
return button(NiDsStadiaController.Button.kRightBumper.value, loop);
}
/**
@@ -218,7 +218,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger leftStick(EventLoop loop) {
return button(StadiaController.Button.kLeftStick.value, loop);
return button(NiDsStadiaController.Button.kLeftStick.value, loop);
}
/**
@@ -242,7 +242,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger rightStick(EventLoop loop) {
return button(StadiaController.Button.kRightStick.value, loop);
return button(NiDsStadiaController.Button.kRightStick.value, loop);
}
/**
@@ -266,7 +266,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger ellipses(EventLoop loop) {
return button(StadiaController.Button.kEllipses.value, loop);
return button(NiDsStadiaController.Button.kEllipses.value, loop);
}
/**
@@ -290,7 +290,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger hamburger(EventLoop loop) {
return button(StadiaController.Button.kHamburger.value, loop);
return button(NiDsStadiaController.Button.kHamburger.value, loop);
}
/**
@@ -314,7 +314,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger stadia(EventLoop loop) {
return button(StadiaController.Button.kStadia.value, loop);
return button(NiDsStadiaController.Button.kStadia.value, loop);
}
/**
@@ -338,7 +338,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger rightTrigger(EventLoop loop) {
return button(StadiaController.Button.kRightTrigger.value, loop);
return button(NiDsStadiaController.Button.kRightTrigger.value, loop);
}
/**
@@ -362,7 +362,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger leftTrigger(EventLoop loop) {
return button(StadiaController.Button.kLeftTrigger.value, loop);
return button(NiDsStadiaController.Button.kLeftTrigger.value, loop);
}
/**
@@ -386,7 +386,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger google(EventLoop loop) {
return button(StadiaController.Button.kGoogle.value, loop);
return button(NiDsStadiaController.Button.kGoogle.value, loop);
}
/**
@@ -410,7 +410,7 @@ public class CommandStadiaController extends CommandGenericHID {
* to the given loop.
*/
public Trigger frame(EventLoop loop) {
return button(StadiaController.Button.kFrame.value, loop);
return button(NiDsStadiaController.Button.kFrame.value, loop);
}
/**

44
commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java → commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandNiDsXboxController.java generated
View File

@@ -8,17 +8,17 @@ package org.wpilib.command3.button;
import org.wpilib.command3.Scheduler;
import org.wpilib.command3.Trigger;
import org.wpilib.driverstation.XboxController;
import org.wpilib.driverstation.NiDsXboxController;
import org.wpilib.event.EventLoop;
/**
* A version of {@link XboxController} with {@link Trigger} factories for command-based.
* A version of {@link NiDsXboxController} with {@link Trigger} factories for command-based.
*
* @see XboxController
* @see NiDsXboxController
*/
@SuppressWarnings("MethodName")
public class CommandXboxController extends CommandGenericHID {
private final XboxController m_hid;
public class CommandNiDsXboxController extends CommandGenericHID {
private final NiDsXboxController m_hid;
/**
* Construct an instance of a controller. Commands bound to buttons on the controller will be
@@ -26,9 +26,9 @@ public class CommandXboxController extends CommandGenericHID {
*
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandXboxController(int port) {
public CommandNiDsXboxController(int port) {
super(port);
m_hid = new XboxController(port);
m_hid = new NiDsXboxController(port);
}
/**
@@ -38,9 +38,9 @@ public class CommandXboxController extends CommandGenericHID {
* @param scheduler The scheduler that should execute the triggered commands.
* @param port The port index on the Driver Station that the controller is plugged into.
*/
public CommandXboxController(Scheduler scheduler, int port) {
public CommandNiDsXboxController(Scheduler scheduler, int port) {
super(scheduler, port);
m_hid = new XboxController(port);
m_hid = new NiDsXboxController(port);
}
/**
@@ -49,7 +49,7 @@ public class CommandXboxController extends CommandGenericHID {
* @return the wrapped GenericHID object
*/
@Override
public XboxController getHID() {
public NiDsXboxController getHID() {
return m_hid;
}
@@ -74,7 +74,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger a(EventLoop loop) {
return button(XboxController.Button.kA.value, loop);
return button(NiDsXboxController.Button.kA.value, loop);
}
/**
@@ -98,7 +98,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger b(EventLoop loop) {
return button(XboxController.Button.kB.value, loop);
return button(NiDsXboxController.Button.kB.value, loop);
}
/**
@@ -122,7 +122,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger x(EventLoop loop) {
return button(XboxController.Button.kX.value, loop);
return button(NiDsXboxController.Button.kX.value, loop);
}
/**
@@ -146,7 +146,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger y(EventLoop loop) {
return button(XboxController.Button.kY.value, loop);
return button(NiDsXboxController.Button.kY.value, loop);
}
/**
@@ -170,7 +170,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger leftBumper(EventLoop loop) {
return button(XboxController.Button.kLeftBumper.value, loop);
return button(NiDsXboxController.Button.kLeftBumper.value, loop);
}
/**
@@ -194,7 +194,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger rightBumper(EventLoop loop) {
return button(XboxController.Button.kRightBumper.value, loop);
return button(NiDsXboxController.Button.kRightBumper.value, loop);
}
/**
@@ -218,7 +218,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger back(EventLoop loop) {
return button(XboxController.Button.kBack.value, loop);
return button(NiDsXboxController.Button.kBack.value, loop);
}
/**
@@ -242,7 +242,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger start(EventLoop loop) {
return button(XboxController.Button.kStart.value, loop);
return button(NiDsXboxController.Button.kStart.value, loop);
}
/**
@@ -266,7 +266,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger leftStick(EventLoop loop) {
return button(XboxController.Button.kLeftStick.value, loop);
return button(NiDsXboxController.Button.kLeftStick.value, loop);
}
/**
@@ -290,7 +290,7 @@ public class CommandXboxController extends CommandGenericHID {
* to the given loop.
*/
public Trigger rightStick(EventLoop loop) {
return button(XboxController.Button.kRightStick.value, loop);
return button(NiDsXboxController.Button.kRightStick.value, loop);
}
/**
@@ -304,7 +304,7 @@ public class CommandXboxController extends CommandGenericHID {
* threshold, attached to the given event loop
*/
public Trigger leftTrigger(double threshold, EventLoop loop) {
return axisGreaterThan(XboxController.Axis.kLeftTrigger.value, threshold, loop);
return axisGreaterThan(NiDsXboxController.Axis.kLeftTrigger.value, threshold, loop);
}
/**
@@ -346,7 +346,7 @@ public class CommandXboxController extends CommandGenericHID {
* threshold, attached to the given event loop
*/
public Trigger rightTrigger(double threshold, EventLoop loop) {
return axisGreaterThan(XboxController.Axis.kRightTrigger.value, threshold, loop);
return axisGreaterThan(NiDsXboxController.Axis.kRightTrigger.value, threshold, loop);
}
/**