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

[wpilibc] Fix return value of DriverStation::GetJoystickAxisType() (#4230)

Browse Source 
It was returning a pointer to the axis type array cast to a bool (always
1) instead of returning the desired axis type.
This commit is contained in:
Tyler Veness
2022-05-18 14:36:11 -07:00
committed by GitHub
parent 4ac34c0141
commit 65b23ac45e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/cpp/DriverStation.cpp
View File

@@ -456,11 +456,15 @@ int DriverStation::GetJoystickAxisType(int stick, int axis) {
FRC_ReportError(warn::BadJoystickIndex, "stick {} out of range", stick);
return -1;
}
if (axis < 0 || axis >= HAL_kMaxJoystickAxes) {
FRC_ReportError(warn::BadJoystickAxis, "axis {} out of range", axis);
return -1;
}
HAL_JoystickDescriptor descriptor;
HAL_GetJoystickDescriptor(stick, &descriptor);
return static_cast<bool>(descriptor.axisTypes);
return descriptor.axisTypes[axis];
}
bool DriverStation::IsJoystickConnected(int stick) {