[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.

commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandNiDsPS4Controller.java

@@ -7,26 +7,26 @@
 package org.wpilib.command2.button;
 
 import org.wpilib.command2.CommandScheduler;
-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.
    *
    * @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);
   }
 
   /**
@@ -35,7 +35,7 @@ public class CommandPS4Controller extends CommandGenericHID {
    * @return the wrapped GenericHID object
    */
   @Override
-  public PS4Controller getHID() {
+  public NiDsPS4Controller getHID() {
     return m_hid;
   }
 
@@ -58,7 +58,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);
   }
 
   /**
@@ -80,7 +80,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);
   }
 
   /**
@@ -102,7 +102,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);
   }
 
   /**
@@ -124,7 +124,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);
   }
 
   /**
@@ -146,7 +146,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);
   }
 
   /**
@@ -168,7 +168,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);
   }
 
   /**
@@ -190,7 +190,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);
   }
 
   /**
@@ -212,7 +212,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);
   }
 
   /**
@@ -234,7 +234,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);
   }
 
   /**
@@ -256,7 +256,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);
   }
 
   /**
@@ -278,7 +278,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);
   }
 
   /**
@@ -300,7 +300,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);
   }
 
   /**
@@ -322,7 +322,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);
   }
 
   /**
@@ -344,7 +344,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);
   }
 
   /**

commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandNiDsPS5Controller.java

@@ -7,26 +7,26 @@
 package org.wpilib.command2.button;
 
 import org.wpilib.command2.CommandScheduler;
-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.
    *
    * @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);
   }
 
   /**
@@ -35,7 +35,7 @@ public class CommandPS5Controller extends CommandGenericHID {
    * @return the wrapped GenericHID object
    */
   @Override
-  public PS5Controller getHID() {
+  public NiDsPS5Controller getHID() {
     return m_hid;
   }
 
@@ -58,7 +58,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);
   }
 
   /**
@@ -80,7 +80,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);
   }
 
   /**
@@ -102,7 +102,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);
   }
 
   /**
@@ -124,7 +124,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);
   }
 
   /**
@@ -146,7 +146,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);
   }
 
   /**
@@ -168,7 +168,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);
   }
 
   /**
@@ -190,7 +190,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);
   }
 
   /**
@@ -212,7 +212,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);
   }
 
   /**
@@ -234,7 +234,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);
   }
 
   /**
@@ -256,7 +256,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);
   }
 
   /**
@@ -278,7 +278,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);
   }
 
   /**
@@ -300,7 +300,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);
   }
 
   /**
@@ -322,7 +322,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);
   }
 
   /**
@@ -344,7 +344,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);
   }
 
   /**

commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandNiDsStadiaController.java

@@ -7,26 +7,26 @@
 package org.wpilib.command2.button;
 
 import org.wpilib.command2.CommandScheduler;
-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.
    *
    * @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);
   }
 
   /**
@@ -35,7 +35,7 @@ public class CommandStadiaController extends CommandGenericHID {
    * @return the wrapped GenericHID object
    */
   @Override
-  public StadiaController getHID() {
+  public NiDsStadiaController getHID() {
     return m_hid;
   }
 
@@ -58,7 +58,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);
   }
 
   /**
@@ -80,7 +80,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);
   }
 
   /**
@@ -102,7 +102,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);
   }
 
   /**
@@ -124,7 +124,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);
   }
 
   /**
@@ -146,7 +146,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);
   }
 
   /**
@@ -168,7 +168,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);
   }
 
   /**
@@ -190,7 +190,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);
   }
 
   /**
@@ -212,7 +212,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);
   }
 
   /**
@@ -234,7 +234,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);
   }
 
   /**
@@ -256,7 +256,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);
   }
 
   /**
@@ -278,7 +278,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);
   }
 
   /**
@@ -300,7 +300,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);
   }
 
   /**
@@ -322,7 +322,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);
   }
 
   /**
@@ -344,7 +344,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);
   }
 
   /**
@@ -366,7 +366,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);
   }
 
   /**

commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandNiDsXboxController.java

@@ -7,26 +7,26 @@
 package org.wpilib.command2.button;
 
 import org.wpilib.command2.CommandScheduler;
-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.
    *
    * @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);
   }
 
   /**
@@ -35,7 +35,7 @@ public class CommandXboxController extends CommandGenericHID {
    * @return the wrapped GenericHID object
    */
   @Override
-  public XboxController getHID() {
+  public NiDsXboxController getHID() {
     return m_hid;
   }
 
@@ -58,7 +58,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);
   }
 
   /**
@@ -80,7 +80,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);
   }
 
   /**
@@ -102,7 +102,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);
   }
 
   /**
@@ -124,7 +124,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);
   }
 
   /**
@@ -146,7 +146,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);
   }
 
   /**
@@ -168,7 +168,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);
   }
 
   /**
@@ -190,7 +190,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);
   }
 
   /**
@@ -212,7 +212,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);
   }
 
   /**
@@ -234,7 +234,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);
   }
 
   /**
@@ -256,7 +256,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);
   }
 
   /**
@@ -270,7 +270,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);
   }
 
   /**
@@ -309,7 +309,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);
   }
 
   /**

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandNiDsPS4Controller.cpp

@@ -0,0 +1,96 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
+
+#include "wpi/commands2/button/CommandNiDsPS4Controller.hpp"
+
+using namespace wpi::cmd;
+
+CommandNiDsPS4Controller::CommandNiDsPS4Controller(int port)
+    : CommandGenericHID(port), m_hid{wpi::NiDsPS4Controller(port)} {}
+
+wpi::NiDsPS4Controller& CommandNiDsPS4Controller::GetHID() {
+  return m_hid;
+}
+
+Trigger CommandNiDsPS4Controller::Square(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kSquare, loop);
+}
+
+Trigger CommandNiDsPS4Controller::Cross(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kCross, loop);
+}
+
+Trigger CommandNiDsPS4Controller::Circle(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kCircle, loop);
+}
+
+Trigger CommandNiDsPS4Controller::Triangle(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kTriangle, loop);
+}
+
+Trigger CommandNiDsPS4Controller::L1(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kL1, loop);
+}
+
+Trigger CommandNiDsPS4Controller::R1(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kR1, loop);
+}
+
+Trigger CommandNiDsPS4Controller::L2(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kL2, loop);
+}
+
+Trigger CommandNiDsPS4Controller::R2(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kR2, loop);
+}
+
+Trigger CommandNiDsPS4Controller::Share(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kShare, loop);
+}
+
+Trigger CommandNiDsPS4Controller::Options(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kOptions, loop);
+}
+
+Trigger CommandNiDsPS4Controller::L3(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kL3, loop);
+}
+
+Trigger CommandNiDsPS4Controller::R3(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kR3, loop);
+}
+
+Trigger CommandNiDsPS4Controller::PS(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kPS, loop);
+}
+
+Trigger CommandNiDsPS4Controller::Touchpad(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS4Controller::Button::kTouchpad, loop);
+}
+
+double CommandNiDsPS4Controller::GetLeftX() const {
+  return m_hid.GetLeftX();
+}
+
+double CommandNiDsPS4Controller::GetLeftY() const {
+  return m_hid.GetLeftY();
+}
+
+double CommandNiDsPS4Controller::GetRightX() const {
+  return m_hid.GetRightX();
+}
+
+double CommandNiDsPS4Controller::GetRightY() const {
+  return m_hid.GetRightY();
+}
+
+double CommandNiDsPS4Controller::GetL2Axis() const {
+  return m_hid.GetL2Axis();
+}
+
+double CommandNiDsPS4Controller::GetR2Axis() const {
+  return m_hid.GetR2Axis();
+}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandNiDsPS5Controller.cpp

@@ -0,0 +1,96 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
+
+#include "wpi/commands2/button/CommandNiDsPS5Controller.hpp"
+
+using namespace wpi::cmd;
+
+CommandNiDsPS5Controller::CommandNiDsPS5Controller(int port)
+    : CommandGenericHID(port), m_hid{wpi::NiDsPS5Controller(port)} {}
+
+wpi::NiDsPS5Controller& CommandNiDsPS5Controller::GetHID() {
+  return m_hid;
+}
+
+Trigger CommandNiDsPS5Controller::Square(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kSquare, loop);
+}
+
+Trigger CommandNiDsPS5Controller::Cross(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kCross, loop);
+}
+
+Trigger CommandNiDsPS5Controller::Circle(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kCircle, loop);
+}
+
+Trigger CommandNiDsPS5Controller::Triangle(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kTriangle, loop);
+}
+
+Trigger CommandNiDsPS5Controller::L1(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kL1, loop);
+}
+
+Trigger CommandNiDsPS5Controller::R1(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kR1, loop);
+}
+
+Trigger CommandNiDsPS5Controller::L2(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kL2, loop);
+}
+
+Trigger CommandNiDsPS5Controller::R2(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kR2, loop);
+}
+
+Trigger CommandNiDsPS5Controller::Create(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kCreate, loop);
+}
+
+Trigger CommandNiDsPS5Controller::Options(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kOptions, loop);
+}
+
+Trigger CommandNiDsPS5Controller::L3(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kL3, loop);
+}
+
+Trigger CommandNiDsPS5Controller::R3(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kR3, loop);
+}
+
+Trigger CommandNiDsPS5Controller::PS(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kPS, loop);
+}
+
+Trigger CommandNiDsPS5Controller::Touchpad(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsPS5Controller::Button::kTouchpad, loop);
+}
+
+double CommandNiDsPS5Controller::GetLeftX() const {
+  return m_hid.GetLeftX();
+}
+
+double CommandNiDsPS5Controller::GetLeftY() const {
+  return m_hid.GetLeftY();
+}
+
+double CommandNiDsPS5Controller::GetRightX() const {
+  return m_hid.GetRightX();
+}
+
+double CommandNiDsPS5Controller::GetRightY() const {
+  return m_hid.GetRightY();
+}
+
+double CommandNiDsPS5Controller::GetL2Axis() const {
+  return m_hid.GetL2Axis();
+}
+
+double CommandNiDsPS5Controller::GetR2Axis() const {
+  return m_hid.GetR2Axis();
+}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandNiDsStadiaController.cpp

@@ -0,0 +1,92 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
+
+#include "wpi/commands2/button/CommandNiDsStadiaController.hpp"
+
+using namespace wpi::cmd;
+
+CommandNiDsStadiaController::CommandNiDsStadiaController(int port)
+    : CommandGenericHID(port), m_hid{wpi::NiDsStadiaController(port)} {}
+
+wpi::NiDsStadiaController& CommandNiDsStadiaController::GetHID() {
+  return m_hid;
+}
+
+Trigger CommandNiDsStadiaController::A(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kA, loop);
+}
+
+Trigger CommandNiDsStadiaController::B(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kB, loop);
+}
+
+Trigger CommandNiDsStadiaController::X(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kX, loop);
+}
+
+Trigger CommandNiDsStadiaController::Y(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kY, loop);
+}
+
+Trigger CommandNiDsStadiaController::LeftBumper(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kLeftBumper, loop);
+}
+
+Trigger CommandNiDsStadiaController::RightBumper(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kRightBumper, loop);
+}
+
+Trigger CommandNiDsStadiaController::LeftStick(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kLeftStick, loop);
+}
+
+Trigger CommandNiDsStadiaController::RightStick(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kRightStick, loop);
+}
+
+Trigger CommandNiDsStadiaController::Ellipses(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kEllipses, loop);
+}
+
+Trigger CommandNiDsStadiaController::Hamburger(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kHamburger, loop);
+}
+
+Trigger CommandNiDsStadiaController::Stadia(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kStadia, loop);
+}
+
+Trigger CommandNiDsStadiaController::RightTrigger(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kRightTrigger, loop);
+}
+
+Trigger CommandNiDsStadiaController::LeftTrigger(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kLeftTrigger, loop);
+}
+
+Trigger CommandNiDsStadiaController::Google(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kGoogle, loop);
+}
+
+Trigger CommandNiDsStadiaController::Frame(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsStadiaController::Button::kFrame, loop);
+}
+
+double CommandNiDsStadiaController::GetLeftX() const {
+  return m_hid.GetLeftX();
+}
+
+double CommandNiDsStadiaController::GetRightX() const {
+  return m_hid.GetRightX();
+}
+
+double CommandNiDsStadiaController::GetLeftY() const {
+  return m_hid.GetLeftY();
+}
+
+double CommandNiDsStadiaController::GetRightY() const {
+  return m_hid.GetRightY();
+}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandNiDsXboxController.cpp

@@ -0,0 +1,94 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
+
+#include "wpi/commands2/button/CommandNiDsXboxController.hpp"
+
+using namespace wpi::cmd;
+
+CommandNiDsXboxController::CommandNiDsXboxController(int port)
+    : CommandGenericHID(port), m_hid{wpi::NiDsXboxController(port)} {}
+
+wpi::NiDsXboxController& CommandNiDsXboxController::GetHID() {
+  return m_hid;
+}
+
+Trigger CommandNiDsXboxController::A(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kA, loop);
+}
+
+Trigger CommandNiDsXboxController::B(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kB, loop);
+}
+
+Trigger CommandNiDsXboxController::X(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kX, loop);
+}
+
+Trigger CommandNiDsXboxController::Y(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kY, loop);
+}
+
+Trigger CommandNiDsXboxController::LeftBumper(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kLeftBumper, loop);
+}
+
+Trigger CommandNiDsXboxController::RightBumper(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kRightBumper, loop);
+}
+
+Trigger CommandNiDsXboxController::Back(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kBack, loop);
+}
+
+Trigger CommandNiDsXboxController::Start(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kStart, loop);
+}
+
+Trigger CommandNiDsXboxController::LeftStick(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kLeftStick, loop);
+}
+
+Trigger CommandNiDsXboxController::RightStick(wpi::EventLoop* loop) const {
+  return Button(wpi::NiDsXboxController::Button::kRightStick, loop);
+}
+
+Trigger CommandNiDsXboxController::LeftTrigger(double threshold,
+                                           wpi::EventLoop* loop) const {
+  return Trigger(loop, [this, threshold] {
+    return m_hid.GetLeftTriggerAxis() > threshold;
+  });
+}
+
+Trigger CommandNiDsXboxController::RightTrigger(double threshold,
+                                           wpi::EventLoop* loop) const {
+  return Trigger(loop, [this, threshold] {
+    return m_hid.GetRightTriggerAxis() > threshold;
+  });
+}
+
+double CommandNiDsXboxController::GetLeftX() const {
+  return m_hid.GetLeftX();
+}
+
+double CommandNiDsXboxController::GetRightX() const {
+  return m_hid.GetRightX();
+}
+
+double CommandNiDsXboxController::GetLeftY() const {
+  return m_hid.GetLeftY();
+}
+
+double CommandNiDsXboxController::GetRightY() const {
+  return m_hid.GetRightY();
+}
+
+double CommandNiDsXboxController::GetLeftTriggerAxis() const {
+  return m_hid.GetLeftTriggerAxis();
+}
+
+double CommandNiDsXboxController::GetRightTriggerAxis() const {
+  return m_hid.GetRightTriggerAxis();
+}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS4Controller.cpp

@@ -1,96 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
-
-#include "wpi/commands2/button/CommandPS4Controller.hpp"
-
-using namespace wpi::cmd;
-
-CommandPS4Controller::CommandPS4Controller(int port)
-    : CommandGenericHID(port), m_hid{wpi::PS4Controller(port)} {}
-
-wpi::PS4Controller& CommandPS4Controller::GetHID() {
-  return m_hid;
-}
-
-Trigger CommandPS4Controller::Square(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kSquare, loop);
-}
-
-Trigger CommandPS4Controller::Cross(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kCross, loop);
-}
-
-Trigger CommandPS4Controller::Circle(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kCircle, loop);
-}
-
-Trigger CommandPS4Controller::Triangle(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kTriangle, loop);
-}
-
-Trigger CommandPS4Controller::L1(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kL1, loop);
-}
-
-Trigger CommandPS4Controller::R1(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kR1, loop);
-}
-
-Trigger CommandPS4Controller::L2(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kL2, loop);
-}
-
-Trigger CommandPS4Controller::R2(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kR2, loop);
-}
-
-Trigger CommandPS4Controller::Share(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kShare, loop);
-}
-
-Trigger CommandPS4Controller::Options(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kOptions, loop);
-}
-
-Trigger CommandPS4Controller::L3(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kL3, loop);
-}
-
-Trigger CommandPS4Controller::R3(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kR3, loop);
-}
-
-Trigger CommandPS4Controller::PS(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kPS, loop);
-}
-
-Trigger CommandPS4Controller::Touchpad(wpi::EventLoop* loop) const {
-  return Button(wpi::PS4Controller::Button::kTouchpad, loop);
-}
-
-double CommandPS4Controller::GetLeftX() const {
-  return m_hid.GetLeftX();
-}
-
-double CommandPS4Controller::GetLeftY() const {
-  return m_hid.GetLeftY();
-}
-
-double CommandPS4Controller::GetRightX() const {
-  return m_hid.GetRightX();
-}
-
-double CommandPS4Controller::GetRightY() const {
-  return m_hid.GetRightY();
-}
-
-double CommandPS4Controller::GetL2Axis() const {
-  return m_hid.GetL2Axis();
-}
-
-double CommandPS4Controller::GetR2Axis() const {
-  return m_hid.GetR2Axis();
-}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS5Controller.cpp

@@ -1,96 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
-
-#include "wpi/commands2/button/CommandPS5Controller.hpp"
-
-using namespace wpi::cmd;
-
-CommandPS5Controller::CommandPS5Controller(int port)
-    : CommandGenericHID(port), m_hid{wpi::PS5Controller(port)} {}
-
-wpi::PS5Controller& CommandPS5Controller::GetHID() {
-  return m_hid;
-}
-
-Trigger CommandPS5Controller::Square(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kSquare, loop);
-}
-
-Trigger CommandPS5Controller::Cross(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kCross, loop);
-}
-
-Trigger CommandPS5Controller::Circle(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kCircle, loop);
-}
-
-Trigger CommandPS5Controller::Triangle(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kTriangle, loop);
-}
-
-Trigger CommandPS5Controller::L1(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kL1, loop);
-}
-
-Trigger CommandPS5Controller::R1(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kR1, loop);
-}
-
-Trigger CommandPS5Controller::L2(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kL2, loop);
-}
-
-Trigger CommandPS5Controller::R2(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kR2, loop);
-}
-
-Trigger CommandPS5Controller::Create(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kCreate, loop);
-}
-
-Trigger CommandPS5Controller::Options(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kOptions, loop);
-}
-
-Trigger CommandPS5Controller::L3(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kL3, loop);
-}
-
-Trigger CommandPS5Controller::R3(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kR3, loop);
-}
-
-Trigger CommandPS5Controller::PS(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kPS, loop);
-}
-
-Trigger CommandPS5Controller::Touchpad(wpi::EventLoop* loop) const {
-  return Button(wpi::PS5Controller::Button::kTouchpad, loop);
-}
-
-double CommandPS5Controller::GetLeftX() const {
-  return m_hid.GetLeftX();
-}
-
-double CommandPS5Controller::GetLeftY() const {
-  return m_hid.GetLeftY();
-}
-
-double CommandPS5Controller::GetRightX() const {
-  return m_hid.GetRightX();
-}
-
-double CommandPS5Controller::GetRightY() const {
-  return m_hid.GetRightY();
-}
-
-double CommandPS5Controller::GetL2Axis() const {
-  return m_hid.GetL2Axis();
-}
-
-double CommandPS5Controller::GetR2Axis() const {
-  return m_hid.GetR2Axis();
-}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandStadiaController.cpp

@@ -1,92 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
-
-#include "wpi/commands2/button/CommandStadiaController.hpp"
-
-using namespace wpi::cmd;
-
-CommandStadiaController::CommandStadiaController(int port)
-    : CommandGenericHID(port), m_hid{wpi::StadiaController(port)} {}
-
-wpi::StadiaController& CommandStadiaController::GetHID() {
-  return m_hid;
-}
-
-Trigger CommandStadiaController::A(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kA, loop);
-}
-
-Trigger CommandStadiaController::B(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kB, loop);
-}
-
-Trigger CommandStadiaController::X(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kX, loop);
-}
-
-Trigger CommandStadiaController::Y(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kY, loop);
-}
-
-Trigger CommandStadiaController::LeftBumper(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kLeftBumper, loop);
-}
-
-Trigger CommandStadiaController::RightBumper(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kRightBumper, loop);
-}
-
-Trigger CommandStadiaController::LeftStick(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kLeftStick, loop);
-}
-
-Trigger CommandStadiaController::RightStick(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kRightStick, loop);
-}
-
-Trigger CommandStadiaController::Ellipses(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kEllipses, loop);
-}
-
-Trigger CommandStadiaController::Hamburger(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kHamburger, loop);
-}
-
-Trigger CommandStadiaController::Stadia(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kStadia, loop);
-}
-
-Trigger CommandStadiaController::RightTrigger(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kRightTrigger, loop);
-}
-
-Trigger CommandStadiaController::LeftTrigger(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kLeftTrigger, loop);
-}
-
-Trigger CommandStadiaController::Google(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kGoogle, loop);
-}
-
-Trigger CommandStadiaController::Frame(wpi::EventLoop* loop) const {
-  return Button(wpi::StadiaController::Button::kFrame, loop);
-}
-
-double CommandStadiaController::GetLeftX() const {
-  return m_hid.GetLeftX();
-}
-
-double CommandStadiaController::GetRightX() const {
-  return m_hid.GetRightX();
-}
-
-double CommandStadiaController::GetLeftY() const {
-  return m_hid.GetLeftY();
-}
-
-double CommandStadiaController::GetRightY() const {
-  return m_hid.GetRightY();
-}

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandXboxController.cpp

@@ -1,94 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-// THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
-
-#include "wpi/commands2/button/CommandXboxController.hpp"
-
-using namespace wpi::cmd;
-
-CommandXboxController::CommandXboxController(int port)
-    : CommandGenericHID(port), m_hid{wpi::XboxController(port)} {}
-
-wpi::XboxController& CommandXboxController::GetHID() {
-  return m_hid;
-}
-
-Trigger CommandXboxController::A(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kA, loop);
-}
-
-Trigger CommandXboxController::B(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kB, loop);
-}
-
-Trigger CommandXboxController::X(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kX, loop);
-}
-
-Trigger CommandXboxController::Y(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kY, loop);
-}
-
-Trigger CommandXboxController::LeftBumper(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kLeftBumper, loop);
-}
-
-Trigger CommandXboxController::RightBumper(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kRightBumper, loop);
-}
-
-Trigger CommandXboxController::Back(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kBack, loop);
-}
-
-Trigger CommandXboxController::Start(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kStart, loop);
-}
-
-Trigger CommandXboxController::LeftStick(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kLeftStick, loop);
-}
-
-Trigger CommandXboxController::RightStick(wpi::EventLoop* loop) const {
-  return Button(wpi::XboxController::Button::kRightStick, loop);
-}
-
-Trigger CommandXboxController::LeftTrigger(double threshold,
-                                           wpi::EventLoop* loop) const {
-  return Trigger(loop, [this, threshold] {
-    return m_hid.GetLeftTriggerAxis() > threshold;
-  });
-}
-
-Trigger CommandXboxController::RightTrigger(double threshold,
-                                           wpi::EventLoop* loop) const {
-  return Trigger(loop, [this, threshold] {
-    return m_hid.GetRightTriggerAxis() > threshold;
-  });
-}
-
-double CommandXboxController::GetLeftX() const {
-  return m_hid.GetLeftX();
-}
-
-double CommandXboxController::GetRightX() const {
-  return m_hid.GetRightX();
-}
-
-double CommandXboxController::GetLeftY() const {
-  return m_hid.GetLeftY();
-}
-
-double CommandXboxController::GetRightY() const {
-  return m_hid.GetRightY();
-}
-
-double CommandXboxController::GetLeftTriggerAxis() const {
-  return m_hid.GetLeftTriggerAxis();
-}
-
-double CommandXboxController::GetRightTriggerAxis() const {
-  return m_hid.GetRightTriggerAxis();
-}

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandNiDsPS4Controller.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "wpi/driverstation/PS4Controller.hpp"
+#include "wpi/driverstation/NiDsPS4Controller.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
@@ -14,12 +14,12 @@
 
 namespace wpi::cmd {
 /**
- * A version of {@link wpi::PS4Controller} with {@link Trigger} factories for
+ * A version of {@link wpi::NiDsPS4Controller} with {@link Trigger} factories for
  * command-based.
  *
- * @see wpi::PS4Controller
+ * @see wpi::NiDsPS4Controller
  */
-class CommandPS4Controller : public CommandGenericHID {
+class CommandNiDsPS4Controller : public CommandGenericHID {
  public:
   /**
    * Construct an instance of a controller.
@@ -27,14 +27,14 @@ class CommandPS4Controller : public CommandGenericHID {
    * @param port The port index on the Driver Station that the controller is
    * plugged into.
    */
-  explicit CommandPS4Controller(int port);
+  explicit CommandNiDsPS4Controller(int port);
 
   /**
    * Get the underlying GenericHID object.
    *
    * @return the wrapped GenericHID object
    */
-  wpi::PS4Controller& GetHID();
+  wpi::NiDsPS4Controller& GetHID();
 
   /**
    * Constructs a Trigger instance around the square button's
@@ -249,6 +249,6 @@ class CommandPS4Controller : public CommandGenericHID {
   double GetR2Axis() const;
 
  private:
-  wpi::PS4Controller m_hid;
+  wpi::NiDsPS4Controller m_hid;
 };
 }  // namespace wpi::cmd

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandNiDsPS5Controller.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "wpi/driverstation/PS5Controller.hpp"
+#include "wpi/driverstation/NiDsPS5Controller.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
@@ -14,12 +14,12 @@
 
 namespace wpi::cmd {
 /**
- * A version of {@link wpi::PS5Controller} with {@link Trigger} factories for
+ * A version of {@link wpi::NiDsPS5Controller} with {@link Trigger} factories for
  * command-based.
  *
- * @see wpi::PS5Controller
+ * @see wpi::NiDsPS5Controller
  */
-class CommandPS5Controller : public CommandGenericHID {
+class CommandNiDsPS5Controller : public CommandGenericHID {
  public:
   /**
    * Construct an instance of a controller.
@@ -27,14 +27,14 @@ class CommandPS5Controller : public CommandGenericHID {
    * @param port The port index on the Driver Station that the controller is
    * plugged into.
    */
-  explicit CommandPS5Controller(int port);
+  explicit CommandNiDsPS5Controller(int port);
 
   /**
    * Get the underlying GenericHID object.
    *
    * @return the wrapped GenericHID object
    */
-  wpi::PS5Controller& GetHID();
+  wpi::NiDsPS5Controller& GetHID();
 
   /**
    * Constructs a Trigger instance around the square button's
@@ -249,6 +249,6 @@ class CommandPS5Controller : public CommandGenericHID {
   double GetR2Axis() const;
 
  private:
-  wpi::PS5Controller m_hid;
+  wpi::NiDsPS5Controller m_hid;
 };
 }  // namespace wpi::cmd

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandNiDsStadiaController.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "wpi/driverstation/StadiaController.hpp"
+#include "wpi/driverstation/NiDsStadiaController.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
@@ -14,12 +14,12 @@
 
 namespace wpi::cmd {
 /**
- * A version of {@link wpi::StadiaController} with {@link Trigger} factories for
+ * A version of {@link wpi::NiDsStadiaController} with {@link Trigger} factories for
  * command-based.
  *
- * @see wpi::StadiaController
+ * @see wpi::NiDsStadiaController
  */
-class CommandStadiaController : public CommandGenericHID {
+class CommandNiDsStadiaController : public CommandGenericHID {
  public:
   /**
    * Construct an instance of a controller.
@@ -27,14 +27,14 @@ class CommandStadiaController : public CommandGenericHID {
    * @param port The port index on the Driver Station that the controller is
    * plugged into.
    */
-  explicit CommandStadiaController(int port);
+  explicit CommandNiDsStadiaController(int port);
 
   /**
    * Get the underlying GenericHID object.
    *
    * @return the wrapped GenericHID object
    */
-  wpi::StadiaController& GetHID();
+  wpi::NiDsStadiaController& GetHID();
 
   /**
    * Constructs a Trigger instance around the A button's
@@ -245,6 +245,6 @@ class CommandStadiaController : public CommandGenericHID {
   double GetRightY() const;
 
  private:
-  wpi::StadiaController m_hid;
+  wpi::NiDsStadiaController m_hid;
 };
 }  // namespace wpi::cmd

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandNiDsXboxController.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "wpi/driverstation/XboxController.hpp"
+#include "wpi/driverstation/NiDsXboxController.hpp"
 
 #include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
@@ -14,12 +14,12 @@
 
 namespace wpi::cmd {
 /**
- * A version of {@link wpi::XboxController} with {@link Trigger} factories for
+ * A version of {@link wpi::NiDsXboxController} with {@link Trigger} factories for
  * command-based.
  *
- * @see wpi::XboxController
+ * @see wpi::NiDsXboxController
  */
-class CommandXboxController : public CommandGenericHID {
+class CommandNiDsXboxController : public CommandGenericHID {
  public:
   /**
    * Construct an instance of a controller.
@@ -27,14 +27,14 @@ class CommandXboxController : public CommandGenericHID {
    * @param port The port index on the Driver Station that the controller is
    * plugged into.
    */
-  explicit CommandXboxController(int port);
+  explicit CommandNiDsXboxController(int port);
 
   /**
    * Get the underlying GenericHID object.
    *
    * @return the wrapped GenericHID object
    */
-  wpi::XboxController& GetHID();
+  wpi::NiDsXboxController& GetHID();
 
   /**
    * Constructs a Trigger instance around the A button's
@@ -235,6 +235,6 @@ class CommandXboxController : public CommandGenericHID {
   double GetRightTriggerAxis() const;
 
  private:
-  wpi::XboxController m_hid;
+  wpi::NiDsXboxController m_hid;
 };
 }  // namespace wpi::cmd

commandsv2/src/main/python/commands2/button/__init__.py

@@ -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",

commandsv2/src/main/python/commands2/button/commandnidsps4controller.py

@@ -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.
 

commandsv2/src/main/python/commands2/button/commandnidsxboxcontroller.py

@@ -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.