mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
[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.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
from .commandgenerichid import CommandGenericHID
|
||||
from .commandjoystick import CommandJoystick
|
||||
from .commandps4controller import CommandPS4Controller
|
||||
from .commandxboxcontroller import CommandXboxController
|
||||
from .commandnidsps4controller import CommandNiDsPS4Controller
|
||||
from .commandnidsxboxcontroller import CommandNiDsXboxController
|
||||
from .joystickbutton import JoystickButton
|
||||
from .networkbutton import NetworkButton
|
||||
from .povbutton import POVButton
|
||||
@@ -11,8 +11,8 @@ __all__ = [
|
||||
"Trigger",
|
||||
"CommandGenericHID",
|
||||
"CommandJoystick",
|
||||
"CommandPS4Controller",
|
||||
"CommandXboxController",
|
||||
"CommandNiDsPS4Controller",
|
||||
"CommandNiDsXboxController",
|
||||
"JoystickButton",
|
||||
"NetworkButton",
|
||||
"POVButton",
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
# validated: 2024-01-20 DS d426873ed15b button/CommandPS4Controller.java
|
||||
# validated: 2024-01-20 DS d426873ed15b button/CommandNiDsPS4Controller.java
|
||||
from typing import Optional
|
||||
|
||||
from wpilib import EventLoop, PS4Controller
|
||||
from wpilib import EventLoop, NiDsPS4Controller
|
||||
|
||||
from ..commandscheduler import CommandScheduler
|
||||
from .commandgenerichid import CommandGenericHID
|
||||
from .trigger import Trigger
|
||||
|
||||
|
||||
class CommandPS4Controller(CommandGenericHID):
|
||||
class CommandNiDsPS4Controller(CommandGenericHID):
|
||||
"""
|
||||
A version of PS4Controller with Trigger factories for command-based.
|
||||
A version of NI DS PS4Controller with Trigger factories for command-based.
|
||||
"""
|
||||
|
||||
_hid: PS4Controller
|
||||
_hid: NiDsPS4Controller
|
||||
|
||||
def __init__(self, port: int):
|
||||
"""
|
||||
@@ -22,9 +22,9 @@ class CommandPS4Controller(CommandGenericHID):
|
||||
:param port: The port index on the Driver Station that the device is plugged into.
|
||||
"""
|
||||
super().__init__(port)
|
||||
self._hid = PS4Controller(port)
|
||||
self._hid = NiDsPS4Controller(port)
|
||||
|
||||
def getHID(self) -> PS4Controller:
|
||||
def getHID(self) -> NiDsPS4Controller:
|
||||
"""
|
||||
Get the underlying GenericHID object.
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
# validated: 2024-01-20 DS 3ba501f9478a button/CommandXboxController.java
|
||||
from typing import Optional
|
||||
|
||||
from wpilib import EventLoop, XboxController
|
||||
from wpilib import EventLoop, NiDsXboxController
|
||||
|
||||
from ..commandscheduler import CommandScheduler
|
||||
from .commandgenerichid import CommandGenericHID
|
||||
from .trigger import Trigger
|
||||
|
||||
|
||||
class CommandXboxController(CommandGenericHID):
|
||||
class CommandNiDsXboxController(CommandGenericHID):
|
||||
"""
|
||||
A version of XboxController with Trigger factories for command-based.
|
||||
A version of NI DS XboxController with Trigger factories for command-based.
|
||||
"""
|
||||
|
||||
_hid: XboxController
|
||||
_hid: NiDsXboxController
|
||||
|
||||
def __init__(self, port: int):
|
||||
"""
|
||||
@@ -22,9 +22,9 @@ class CommandXboxController(CommandGenericHID):
|
||||
:param port: The port index on the Driver Station that the controller is plugged into.
|
||||
"""
|
||||
super().__init__(port)
|
||||
self._hid = XboxController(port)
|
||||
self._hid = NiDsXboxController(port)
|
||||
|
||||
def getHID(self) -> XboxController:
|
||||
def getHID(self) -> NiDsXboxController:
|
||||
"""
|
||||
Get the underlying GenericHID object.
|
||||
|
||||
Reference in New Issue
Block a user