[commands] HID classes: Add missing methods, tweak return types (#4557)

- Make return type of getHID reflect the specific class - Add getX and getY to CommandJoystick
wpilibsuite · Nov 3, 2022 · 102344e · 102344e
1 parent 1831ef3
commit 102344e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
@@ -4,7 +4,6 @@
 
 package edu.wpi.first.wpilibj2.command.button;
 
-import edu.wpi.first.wpilibj.GenericHID;
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.event.EventLoop;
 import edu.wpi.first.wpilibj2.command.CommandScheduler;
@@ -33,7 +32,7 @@ public CommandJoystick(int port) {
    * @return the wrapped GenericHID object
    */
   @Override
-  public GenericHID getHID() {
+  public Joystick getHID() {
     return m_hid;
   }
 
@@ -171,6 +170,24 @@ public int getThrottleChannel() {
     return m_hid.getThrottleChannel();
   }
 
+  /**
+   * Get the x position of the HID.
+   *
+   * @return the x position
+   */
+  public double getX() {
+    return m_hid.getX();
+  }
+
+  /**
+   * Get the y position of the HID.
+   *
+   * @return the y position
+   */
+  public double getY() {
+    return m_hid.getY();
+  }
+
   /**
    * Get the z position of the HID.
    *

diff --git a/...NewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java b/...NewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java
@@ -4,7 +4,6 @@
 
 package edu.wpi.first.wpilibj2.command.button;
 
-import edu.wpi.first.wpilibj.GenericHID;
 import edu.wpi.first.wpilibj.PS4Controller;
 import edu.wpi.first.wpilibj.event.EventLoop;
 import edu.wpi.first.wpilibj2.command.CommandScheduler;
@@ -34,7 +33,7 @@ public CommandPS4Controller(int port) {
    * @return the wrapped GenericHID object
    */
   @Override
-  public GenericHID getHID() {
+  public PS4Controller getHID() {
     return m_hid;
   }