Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01: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

20
wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java → wpilibj/src/test/java/org/wpilib/driverstation/NiDsPS4ControllerTest.java
View File

@@ -13,16 +13,16 @@ import java.lang.reflect.Method;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.wpilib.hardware.hal.HAL;
import org.wpilib.simulation.PS4ControllerSim;
import org.wpilib.simulation.NiDsPS4ControllerSim;
class PS4ControllerTest {
class NiDsPS4ControllerTest {
@ParameterizedTest
@EnumSource(value = PS4Controller.Button.class)
void testButtons(PS4Controller.Button button)
@EnumSource(value = NiDsPS4Controller.Button.class)
void testButtons(NiDsPS4Controller.Button button)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
HAL.initialize(500, 0);
PS4Controller joy = new PS4Controller(2);
PS4ControllerSim joysim = new PS4ControllerSim(joy);
NiDsPS4Controller joy = new NiDsPS4Controller(2);
NiDsPS4ControllerSim joysim = new NiDsPS4ControllerSim(joy);
var buttonName = button.toString();
@@ -57,12 +57,12 @@ class PS4ControllerTest {
}
@ParameterizedTest
@EnumSource(value = PS4Controller.Axis.class)
void testAxes(PS4Controller.Axis axis)
@EnumSource(value = NiDsPS4Controller.Axis.class)
void testAxes(NiDsPS4Controller.Axis axis)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
HAL.initialize(500, 0);
PS4Controller joy = new PS4Controller(2);
PS4ControllerSim joysim = new PS4ControllerSim(joy);
NiDsPS4Controller joy = new NiDsPS4Controller(2);
NiDsPS4ControllerSim joysim = new NiDsPS4ControllerSim(joy);
var axisName = axis.toString();

20
wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java → wpilibj/src/test/java/org/wpilib/driverstation/NiDsPS5ControllerTest.java
View File

@@ -13,16 +13,16 @@ import java.lang.reflect.Method;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.wpilib.hardware.hal.HAL;
import org.wpilib.simulation.PS5ControllerSim;
import org.wpilib.simulation.NiDsPS5ControllerSim;
class PS5ControllerTest {
class NiDsPS5ControllerTest {
@ParameterizedTest
@EnumSource(value = PS5Controller.Button.class)
void testButtons(PS5Controller.Button button)
@EnumSource(value = NiDsPS5Controller.Button.class)
void testButtons(NiDsPS5Controller.Button button)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
HAL.initialize(500, 0);
PS5Controller joy = new PS5Controller(2);
PS5ControllerSim joysim = new PS5ControllerSim(joy);
NiDsPS5Controller joy = new NiDsPS5Controller(2);
NiDsPS5ControllerSim joysim = new NiDsPS5ControllerSim(joy);
var buttonName = button.toString();
@@ -57,12 +57,12 @@ class PS5ControllerTest {
}
@ParameterizedTest
@EnumSource(value = PS5Controller.Axis.class)
void testAxes(PS5Controller.Axis axis)
@EnumSource(value = NiDsPS5Controller.Axis.class)
void testAxes(NiDsPS5Controller.Axis axis)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
HAL.initialize(500, 0);
PS5Controller joy = new PS5Controller(2);
PS5ControllerSim joysim = new PS5ControllerSim(joy);
NiDsPS5Controller joy = new NiDsPS5Controller(2);
NiDsPS5ControllerSim joysim = new NiDsPS5ControllerSim(joy);
var axisName = axis.toString();

20
wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java → wpilibj/src/test/java/org/wpilib/driverstation/NiDsXboxControllerTest.java
View File

@@ -13,16 +13,16 @@ import java.lang.reflect.Method;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.wpilib.hardware.hal.HAL;
import org.wpilib.simulation.XboxControllerSim;
import org.wpilib.simulation.NiDsXboxControllerSim;
class XboxControllerTest {
class NiDsXboxControllerTest {
@ParameterizedTest
@EnumSource(value = XboxController.Button.class)
void testButtons(XboxController.Button button)
@EnumSource(value = NiDsXboxController.Button.class)
void testButtons(NiDsXboxController.Button button)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
HAL.initialize(500, 0);
XboxController joy = new XboxController(2);
XboxControllerSim joysim = new XboxControllerSim(joy);
NiDsXboxController joy = new NiDsXboxController(2);
NiDsXboxControllerSim joysim = new NiDsXboxControllerSim(joy);
var buttonName = button.toString();
@@ -57,12 +57,12 @@ class XboxControllerTest {
}
@ParameterizedTest
@EnumSource(value = XboxController.Axis.class)
void testAxes(XboxController.Axis axis)
@EnumSource(value = NiDsXboxController.Axis.class)
void testAxes(NiDsXboxController.Axis axis)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
HAL.initialize(500, 0);
XboxController joy = new XboxController(2);
XboxControllerSim joysim = new XboxControllerSim(joy);
NiDsXboxController joy = new NiDsXboxController(2);
NiDsXboxControllerSim joysim = new NiDsXboxControllerSim(joy);
var axisName = axis.toString();