Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Axis enum in XboxController (#2253)

Browse Source
This commit is contained in:
Prateek Machiraju
2020-01-11 02:43:19 -05:00
committed by Peter Johnson
parent ab9647ff5b
commit d4c8ee5915
3 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibc/src/main/native/cpp/XboxController.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2016-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -17,25 +17,25 @@ XboxController::XboxController(int port) : GenericHID(port) {
double XboxController::GetX(JoystickHand hand) const {
if (hand == kLeftHand) {
return GetRawAxis(0);
return GetRawAxis(static_cast<int>(Axis::kLeftX));
} else {
return GetRawAxis(4);
return GetRawAxis(static_cast<int>(Axis::kRightX));
}
}
double XboxController::GetY(JoystickHand hand) const {
if (hand == kLeftHand) {
return GetRawAxis(1);
return GetRawAxis(static_cast<int>(Axis::kLeftY));
} else {
return GetRawAxis(5);
return GetRawAxis(static_cast<int>(Axis::kRightY));
}
}
double XboxController::GetTriggerAxis(JoystickHand hand) const {
if (hand == kLeftHand) {
return GetRawAxis(2);
return GetRawAxis(static_cast<int>(Axis::kLeftTrigger));
} else {
return GetRawAxis(3);
return GetRawAxis(static_cast<int>(Axis::kRightTrigger));
}
}

11
wpilibc/src/main/native/include/frc/XboxController.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2016-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -244,6 +244,15 @@ class XboxController : public GenericHID {
kBack = 7,
kStart = 8
};
enum class Axis {
kLeftX = 0,
kRightX = 4,
kLeftY = 1,
kRightY = 5,
kLeftTrigger = 2,
kRightTrigger = 3
};
};
} // namespace frc

33
wpilibj/src/main/java/edu/wpi/first/wpilibj/XboxController.java
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2016-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -41,6 +41,25 @@ public class XboxController extends GenericHID {
}
}
/**
* Represents an axis on an XboxController.
*/
public enum Axis {
kLeftX(0),
kRightX(4),
kLeftY(1),
kRightY(5),
kLeftTrigger(2),
kRightTrigger(3);
@SuppressWarnings({"MemberName", "PMD.SingularField"})
public final int value;
Axis(int value) {
this.value = value;
}
}
/**
* Construct an instance of a joystick. The joystick index is the USB port on the drivers
* station.
@@ -62,9 +81,9 @@ public class XboxController extends GenericHID {
@Override
public double getX(Hand hand) {
if (hand.equals(Hand.kLeft)) {
return getRawAxis(0);
return getRawAxis(Axis.kLeftX.value);
} else {
return getRawAxis(4);
return getRawAxis(Axis.kRightX.value);
}
}
@@ -77,9 +96,9 @@ public class XboxController extends GenericHID {
@Override
public double getY(Hand hand) {
if (hand.equals(Hand.kLeft)) {
return getRawAxis(1);
return getRawAxis(Axis.kLeftY.value);
} else {
return getRawAxis(5);
return getRawAxis(Axis.kRightY.value);
}
}
@@ -91,9 +110,9 @@ public class XboxController extends GenericHID {
*/
public double getTriggerAxis(Hand hand) {
if (hand.equals(Hand.kLeft)) {
return getRawAxis(2);
return getRawAxis(Axis.kLeftTrigger.value);
} else {
return getRawAxis(3);
return getRawAxis(Axis.kRightTrigger.value);
}
}