[wpilib] Prefix all NI DS specific controller classes (#8596)

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.

wpilibc/src/main/python/pyproject.toml

@@ -109,10 +109,10 @@ DriverStation = "wpi/driverstation/DriverStation.hpp"
 Gamepad = "wpi/driverstation/Gamepad.hpp"
 GenericHID = "wpi/driverstation/GenericHID.hpp"
 Joystick = "wpi/driverstation/Joystick.hpp"
-PS4Controller = "wpi/driverstation/PS4Controller.hpp"
-PS5Controller = "wpi/driverstation/PS5Controller.hpp"
-StadiaController = "wpi/driverstation/StadiaController.hpp"
-XboxController = "wpi/driverstation/XboxController.hpp"
+NiDsPS4Controller = "wpi/driverstation/NiDsPS4Controller.hpp"
+NiDsPS5Controller = "wpi/driverstation/NiDsPS5Controller.hpp"
+NiDsStadiaController = "wpi/driverstation/NiDsStadiaController.hpp"
+NiDsXboxController = "wpi/driverstation/NiDsXboxController.hpp"
 
 # wpi/event
 BooleanEvent = "wpi/event/BooleanEvent.hpp"
@@ -264,8 +264,8 @@ GamepadSim = "wpi/simulation/GamepadSim.hpp"
 GenericHIDSim = "wpi/simulation/GenericHIDSim.hpp"
 JoystickSim = "wpi/simulation/JoystickSim.hpp"
 LinearSystemSim = "wpi/simulation/LinearSystemSim.hpp"
-PS4ControllerSim = "wpi/simulation/PS4ControllerSim.hpp"
-PS5ControllerSim = "wpi/simulation/PS5ControllerSim.hpp"
+NiDsPS4ControllerSim = "wpi/simulation/NiDsPS4ControllerSim.hpp"
+NiDsPS5ControllerSim = "wpi/simulation/NiDsPS5ControllerSim.hpp"
 PWMSim = "wpi/simulation/PWMSim.hpp"
 PneumaticsBaseSim = "wpi/simulation/PneumaticsBaseSim.hpp"
 PowerDistributionSim = "wpi/simulation/PowerDistributionSim.hpp"
@@ -278,5 +278,5 @@ SimDeviceSim = "wpi/simulation/SimDeviceSim.hpp"
 SimHooks = "wpi/simulation/SimHooks.hpp"
 SingleJointedArmSim = "wpi/simulation/SingleJointedArmSim.hpp"
 SolenoidSim = "wpi/simulation/SolenoidSim.hpp"
-StadiaControllerSim = "wpi/simulation/StadiaControllerSim.hpp"
-XboxControllerSim = "wpi/simulation/XboxControllerSim.hpp"
+NiDsStadiaControllerSim = "wpi/simulation/NiDsStadiaControllerSim.hpp"
+NiDsXboxControllerSim = "wpi/simulation/NiDsXboxControllerSim.hpp"

wpilibc/src/main/python/semiwrap/NiDsPS4Controller.yml

@@ -3,11 +3,11 @@ extra_includes:
 - wpi/event/BooleanEvent.hpp
 
 classes:
-  wpi::PS4Controller:
+  wpi::NiDsPS4Controller:
     ignored_bases:
-    - wpi::util::SendableHelper<PS4Controller>
+    - wpi::util::SendableHelper<NiDsPS4Controller>
     methods:
-      PS4Controller:
+      NiDsPS4Controller:
       GetLeftX:
       GetRightX:
       GetLeftY:
@@ -66,15 +66,12 @@ classes:
       GetPSButtonPressed:
       GetPSButtonReleased:
       PS:
-      GetTouchpad:
-      GetTouchpadPressed:
-      GetTouchpadReleased:
       Touchpad:
       GetTouchpadButton:
       GetTouchpadButtonPressed:
       GetTouchpadButtonReleased:
       InitSendable:
-  wpi::PS4Controller::Button:
+  wpi::NiDsPS4Controller::Button:
     attributes:
       kSquare:
       kCross:
@@ -90,7 +87,7 @@ classes:
       kR3:
       kPS:
       kTouchpad:
-  wpi::PS4Controller::Axis:
+  wpi::NiDsPS4Controller::Axis:
     attributes:
       kLeftX:
       kLeftY:

wpilibc/src/main/python/semiwrap/NiDsPS5Controller.yml

@@ -2,11 +2,11 @@ extra_includes:
 - wpi/util/sendable/SendableBuilder.hpp
 
 classes:
-  wpi::PS5Controller:
+  wpi::NiDsPS5Controller:
     ignored_bases:
-    - wpi::util::SendableHelper<PS5Controller>
+    - wpi::util::SendableHelper<NiDsPS5Controller>
     methods:
-      PS5Controller:
+      NiDsPS5Controller:
       GetLeftX:
       GetRightX:
       GetLeftY:
@@ -65,15 +65,12 @@ classes:
       GetPSButtonPressed:
       GetPSButtonReleased:
       PS:
-      GetTouchpad:
-      GetTouchpadPressed:
-      GetTouchpadReleased:
       Touchpad:
       GetTouchpadButton:
       GetTouchpadButtonPressed:
       GetTouchpadButtonReleased:
       InitSendable:
-  wpi::PS5Controller::Button:
+  wpi::NiDsPS5Controller::Button:
     attributes:
       kSquare:
       kCross:
@@ -89,7 +86,7 @@ classes:
       kR3:
       kPS:
       kTouchpad:
-  wpi::PS5Controller::Axis:
+  wpi::NiDsPS5Controller::Axis:
     attributes:
       kLeftX:
       kLeftY:

wpilibc/src/main/python/semiwrap/NiDsStadiaController.yml

@@ -2,21 +2,15 @@ extra_includes:
 - wpi/util/sendable/SendableBuilder.hpp
 
 classes:
-  wpi::StadiaController:
+  wpi::NiDsStadiaController:
     ignored_bases:
-    - wpi::util::SendableHelper<StadiaController>
+    - wpi::util::SendableHelper<NiDsStadiaController>
     methods:
-      StadiaController:
+      NiDsStadiaController:
       GetLeftX:
       GetRightX:
       GetLeftY:
       GetRightY:
-      GetLeftBumper:
-      GetRightBumper:
-      GetLeftBumperPressed:
-      GetRightBumperPressed:
-      GetLeftBumperReleased:
-      GetRightBumperReleased:
       LeftBumper:
       RightBumper:
       GetLeftStickButton:
@@ -78,7 +72,7 @@ classes:
       GetRightBumperButtonPressed:
       GetRightBumperButtonReleased:
       InitSendable:
-  wpi::StadiaController::Button:
+  wpi::NiDsStadiaController::Button:
     attributes:
       kA:
       kB:
@@ -95,7 +89,7 @@ classes:
       kLeftTrigger:
       kGoogle:
       kFrame:
-  wpi::StadiaController::Axis:
+  wpi::NiDsStadiaController::Axis:
     attributes:
       kLeftX:
       kRightX:

wpilibc/src/main/python/semiwrap/NiDsXboxController.yml

@@ -4,23 +4,17 @@ extra_includes:
 - wpi/event/BooleanEvent.hpp
 
 classes:
-  wpi::XboxController:
+  wpi::NiDsXboxController:
     ignored_bases:
-    - wpi::util::SendableHelper<XboxController>
+    - wpi::util::SendableHelper<NiDsXboxController>
     methods:
-      XboxController:
+      NiDsXboxController:
       GetLeftX:
       GetRightX:
       GetLeftY:
       GetRightY:
       GetLeftTriggerAxis:
       GetRightTriggerAxis:
-      GetLeftBumper:
-      GetRightBumper:
-      GetLeftBumperPressed:
-      GetRightBumperPressed:
-      GetLeftBumperReleased:
-      GetRightBumperReleased:
       LeftBumper:
       RightBumper:
       GetLeftStickButton:
@@ -70,7 +64,7 @@ classes:
       GetRightBumperButtonPressed:
       GetRightBumperButtonReleased:
       InitSendable:
-  wpi::XboxController::Button:
+  wpi::NiDsXboxController::Button:
     attributes:
       kLeftBumper:
       kRightBumper:
@@ -82,7 +76,7 @@ classes:
       kY:
       kBack:
       kStart:
-  wpi::XboxController::Axis:
+  wpi::NiDsXboxController::Axis:
     attributes:
       kLeftX:
       kRightX:

wpilibc/src/main/python/semiwrap/simulation/NiDsPS4ControllerSim.yml

@@ -1,13 +1,13 @@
 extra_includes:
-- wpi/driverstation/PS4Controller.hpp
+- wpi/driverstation/NiDsPS4Controller.hpp
 
 classes:
-  wpi::sim::PS4ControllerSim:
+  wpi::sim::NiDsPS4ControllerSim:
     force_no_trampoline: true
     methods:
-      PS4ControllerSim:
+      NiDsPS4ControllerSim:
         overloads:
-          const PS4Controller&:
+          const NiDsPS4Controller&:
           int:
       SetLeftX:
       SetRightX:
@@ -28,6 +28,4 @@ classes:
       SetL3Button:
       SetR3Button:
       SetPSButton:
-      SetTouchpad:
-        ignore: true
       SetTouchpadButton:

wpilibc/src/main/python/semiwrap/simulation/NiDsPS5ControllerSim.yml

@@ -1,13 +1,13 @@
 extra_includes:
-- wpi/driverstation/PS5Controller.hpp
+- wpi/driverstation/NiDsPS5Controller.hpp
 
 classes:
-  wpi::sim::PS5ControllerSim:
+  wpi::sim::NiDsPS5ControllerSim:
     force_no_trampoline: true
     methods:
-      PS5ControllerSim:
+      NiDsPS5ControllerSim:
         overloads:
-          const PS5Controller&:
+          const NiDsPS5Controller&:
           int:
       SetLeftX:
       SetRightX:
@@ -28,6 +28,4 @@ classes:
       SetL3Button:
       SetR3Button:
       SetPSButton:
-      SetTouchpad:
-        ignore: true
       SetTouchpadButton:

wpilibc/src/main/python/semiwrap/simulation/NiDsStadiaControllerSim.yml

@@ -1,13 +1,13 @@
 extra_includes:
-- wpi/driverstation/StadiaController.hpp
+- wpi/driverstation/NiDsStadiaController.hpp
 
 classes:
-  wpi::sim::StadiaControllerSim:
+  wpi::sim::NiDsStadiaControllerSim:
     force_no_trampoline: true
     methods:
-      StadiaControllerSim:
+      NiDsStadiaControllerSim:
         overloads:
-          const StadiaController&:
+          const NiDsStadiaController&:
           int:
       SetLeftX:
       SetRightX:

wpilibc/src/main/python/semiwrap/simulation/NiDsXboxControllerSim.yml

@@ -1,15 +1,15 @@
 extra_includes:
-- wpi/driverstation/XboxController.hpp
+- wpi/driverstation/NiDsXboxController.hpp
 
 classes:
-  wpi::sim::XboxControllerSim:
+  wpi::sim::NiDsXboxControllerSim:
     force_no_trampoline: true
     typealias:
-    - wpi::XboxController
+    - wpi::NiDsXboxController
     methods:
-      XboxControllerSim:
+      NiDsXboxControllerSim:
         overloads:
-          const XboxController&:
+          const NiDsXboxController&:
           int:
       SetLeftX:
       SetRightX:
@@ -17,10 +17,6 @@ classes:
       SetRightY:
       SetLeftTriggerAxis:
       SetRightTriggerAxis:
-      SetLeftBumper:
-        ignore: true
-      SetRightBumper:
-        ignore: true
       SetLeftStickButton:
       SetRightStickButton:
       SetAButton:

wpilibc/src/main/python/wpilib/__init__.py

@@ -53,8 +53,8 @@ from ._wpilib import (
     OnboardIMU,
     OpMode,
     OpModeRobotBase,
-    PS4Controller,
-    PS5Controller,
+    NiDsPS4Controller,
+    NiDsPS5Controller,
     PWM,
     PWMMotorController,
     PWMSparkFlex,
@@ -84,7 +84,7 @@ from ._wpilib import (
     Solenoid,
     Spark,
     SparkMini,
-    StadiaController,
+    NiDsStadiaController,
     SystemServer,
     Tachometer,
     Talon,
@@ -95,7 +95,7 @@ from ._wpilib import (
     UpDownCounter,
     VictorSP,
     Watchdog,
-    XboxController,
+    NiDsXboxController,
     getCurrentThreadPriority,
     getDeployDirectory,
     getErrorMessage,
@@ -157,8 +157,8 @@ __all__ = [
     "OnboardIMU",
     "OpMode",
     "OpModeRobotBase",
-    "PS4Controller",
-    "PS5Controller",
+    "NiDsPS4Controller",
+    "NiDsPS5Controller",
     "PWM",
     "PWMMotorController",
     "PWMSparkFlex",
@@ -188,7 +188,7 @@ __all__ = [
     "Solenoid",
     "Spark",
     "SparkMini",
-    "StadiaController",
+    "NiDsStadiaController",
     "SystemServer",
     "Tachometer",
     "Talon",
@@ -199,7 +199,7 @@ __all__ = [
     "UpDownCounter",
     "VictorSP",
     "Watchdog",
-    "XboxController",
+    "NiDsXboxController",
     "getCurrentThreadPriority",
     "getDeployDirectory",
     "getErrorMessage",

wpilibc/src/main/python/wpilib/simulation/__init__.py

@@ -30,8 +30,8 @@ from ._simulation import (
     LinearSystemSim_2_2_1,
     LinearSystemSim_2_2_2,
     OpModeOptions,
-    PS4ControllerSim,
-    PS5ControllerSim,
+    NiDsPS4ControllerSim,
+    NiDsPS5ControllerSim,
     PWMMotorControllerSim,
     PWMSim,
     PneumaticsBaseSim,
@@ -43,8 +43,8 @@ from ._simulation import (
     SimDeviceSim,
     SingleJointedArmSim,
     SolenoidSim,
-    StadiaControllerSim,
-    XboxControllerSim,
+    NiDsStadiaControllerSim,
+    NiDsXboxControllerSim,
     getProgramStarted,
     getProgramState,
     isTimingPaused,
@@ -88,8 +88,8 @@ __all__ = [
     "LinearSystemSim_2_2_1",
     "LinearSystemSim_2_2_2",
     "OpModeOptions",
-    "PS4ControllerSim",
-    "PS5ControllerSim",
+    "NiDsPS4ControllerSim",
+    "NiDsPS5ControllerSim",
     "PWMMotorControllerSim",
     "PWMSim",
     "PneumaticsBaseSim",
@@ -101,8 +101,8 @@ __all__ = [
     "SimDeviceSim",
     "SingleJointedArmSim",
     "SolenoidSim",
-    "StadiaControllerSim",
-    "XboxControllerSim",
+    "NiDsStadiaControllerSim",
+    "NiDsXboxControllerSim",
     "getProgramStarted",
     "getProgramState",
     "isTimingPaused",