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

Prevented missing joystick messages from coming out more than once a seccond (fixes artf3836)

Browse Source 
Change-Id: I78c0862b0d1c65951a01169db56dbe4eaddf8247
This commit is contained in:
Brad Miller
2014-12-03 07:42:48 -05:00
parent b59f4141c4
commit b1056cf6d7
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibc/wpilibC++Devices/src/DriverStation.cpp
View File

@@ -18,6 +18,7 @@
// set the logging level
TLogLevel dsLogLevel = logDEBUG;
const double JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL = 1.0e06;
#define DS_LOG(level) \
if (level > dsLogLevel) ; \
@@ -40,6 +41,7 @@ DriverStation::DriverStation()
, m_userInAutonomous(false)
, m_userInTeleop(false)
, m_userInTest(false)
, m_nextMessageTime(0)
{
// Create a new semaphore
m_packetDataAvailableMultiWait = initializeMultiWait();
@@ -134,6 +136,14 @@ float DriverStation::GetBatteryVoltage()
return voltage;
}
void DriverStation::ReportJoystickUnpluggedError(std::string message) {
double currentTime = Timer::GetFPGATimestamp();
if (currentTime > m_nextMessageTime) {
ReportError(message);
m_nextMessageTime = currentTime + JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL;
}
}
/**
* Get the value of the axis on a joystick.
* This depends on the mapping of the joystick connected to the specified port.
@@ -157,7 +167,7 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
if (axis >= kMaxJoystickAxes)
wpi_setWPIError(BadJoystickAxis);
else
ReportError("WARNING: Joystick Axis missing, check if all controllers are plugged in\n");
ReportJoystickUnpluggedError("WARNING: Joystick Axis missing, check if all controllers are plugged in\n");
return 0.0f;
}
@@ -192,7 +202,7 @@ int DriverStation::GetStickPOV(uint32_t stick, uint32_t pov) {
if (pov >= kMaxJoystickPOVs)
wpi_setWPIError(BadJoystickAxis);
else
ReportError("WARNING: Joystick POV missing, check if all controllers are plugged in\n");
ReportJoystickUnpluggedError("WARNING: Joystick POV missing, check if all controllers are plugged in\n");
return 0;
}
@@ -216,7 +226,7 @@ bool DriverStation::GetStickButton(uint32_t stick, uint8_t button)
HALGetJoystickButtons(stick, &joystickButtons);
if(button >= joystickButtons.count)
{
ReportError("WARNING: Joystick Button missing, check if all controllers are plugged in\n");
ReportJoystickUnpluggedError("WARNING: Joystick Button missing, check if all controllers are plugged in\n");
return false;
}
return ((0x1 << (button-1)) & joystickButtons.buttons) !=0;