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

[wpilib] Make joystick unplugged warning better in cases of out of range axis/button (#8614)

Browse Source 
Closes #8594 
Fixes #7700 
Also fixes DS HAL to zero out joysticks not received from DS.
This commit is contained in:
Ryan Blue
2026-02-17 23:22:02 -05:00
committed by GitHub
parent 10fa2fced4
commit 0c44e63465
4 changed files with 74 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java
View File

@@ -714,12 +714,8 @@ public final class DriverStation {
m_cacheDataMutex.unlock();
}
reportJoystickUnpluggedWarning(
"Joystick Button "
+ button
+ " on port "
+ stick
+ " not available, check if controller is plugged in");
reportJoystickWarning(
stick, "Joystick Button " + button + " on port " + stick + " not available");
return false;
}
@@ -783,12 +779,8 @@ public final class DriverStation {
m_cacheDataMutex.unlock();
}
reportJoystickUnpluggedWarning(
"Joystick Button "
+ button
+ " on port "
+ stick
+ " not available, check if controller is plugged in");
reportJoystickWarning(
stick, "Joystick Button " + button + " on port " + stick + " not available");
return false;
}
@@ -824,12 +816,8 @@ public final class DriverStation {
m_cacheDataMutex.unlock();
}
reportJoystickUnpluggedWarning(
"Joystick Button "
+ button
+ " on port "
+ stick
+ " not available, check if controller is plugged in");
reportJoystickWarning(
stick, "Joystick Button " + button + " on port " + stick + " not available");
return false;
}
@@ -860,12 +848,7 @@ public final class DriverStation {
m_cacheDataMutex.unlock();
}
reportJoystickUnpluggedWarning(
"Joystick axis "
+ axis
+ " on port "
+ stick
+ " not available, check if controller is plugged in");
reportJoystickWarning(stick, "Joystick axis " + axis + " on port " + stick + " not available");
return 0.0;
}
@@ -903,14 +886,15 @@ public final class DriverStation {
m_cacheDataMutex.unlock();
}
reportJoystickUnpluggedWarning(
reportJoystickWarning(
stick,
"Joystick touchpad finger "
+ finger
+ " on touchpad "
+ touchpad
+ " on port "
+ stick
+ " not available, check if controller is plugged in");
+ " not available");
return new TouchpadFinger(false, 0.0f, 0.0f);
}
@@ -1006,12 +990,7 @@ public final class DriverStation {
m_cacheDataMutex.unlock();
}
reportJoystickUnpluggedWarning(
"Joystick POV "
+ pov
+ " on port "
+ stick
+ " not available, check if controller is plugged in");
reportJoystickWarning(stick, "Joystick POV " + pov + " on port " + stick + " not available");
return POVDirection.Center;
}
@@ -1905,14 +1884,23 @@ public final class DriverStation {
}
/**
* Reports errors related to unplugged joysticks Throttles the errors so that they don't overwhelm
* the DS.
* Reports errors related to joystick availability. Throttles the errors so that they don't
* overwhelm the DS.
*
* @param stick The joystick port.
* @param message The message to report if the joystick is connected.
*/
private static void reportJoystickUnpluggedWarning(String message) {
private static void reportJoystickWarning(int stick, String message) {
if (isFMSAttached() || !m_silenceJoystickWarning) {
double currentTime = Timer.getTimestamp();
if (currentTime > m_nextMessageTime) {
reportWarning(message, false);
if (isJoystickConnected(stick)) {
reportWarning(message, false);
} else {
reportWarning(
"Joystick on port " + stick + " not available, check if controller is plugged in",
false);
}
m_nextMessageTime = currentTime + JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL;
}
}