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

Fix FRCSim artf2589 and cleanup the surrounding code.

Browse Source 
Change-Id: Ic2b7e3efea40e8e65836aac1128b225f92f2b663
This commit is contained in:
Colby Skeggs
2014-06-18 17:17:52 -07:00
parent e69c1ea198
commit f598abf5bc
3 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wpilibc/wpilibC++Sim/include/DriverStation.h
View File

@@ -36,7 +36,8 @@ public:
static const uint32_t kJoystickAxes = 6;
float GetStickAxis(uint32_t stick, uint32_t axis);
bool GetStickButtons(uint32_t stick, uint32_t button);
bool GetStickButton(uint32_t stick, uint32_t button);
short GetStickButtons(uint32_t stick);
float GetAnalogIn(uint32_t channel);
bool GetDigitalIn(uint32_t channel);

71
wpilibc/wpilibC++Sim/src/DriverStation.cpp
View File

@@ -115,18 +115,42 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
wpi_setWPIError(BadJoystickAxis);
return 0.0;
}
if (stick < 1 || stick > 4) {
wpi_setWPIErrorWithContext(ParameterOutOfRange, "stick must be between 1 and 4");
if (stick < 1 || stick > 4)
{
wpi_setWPIError(BadJoystickIndex);
return 0.0;
}
CRITICAL_REGION(m_joystickSemaphore)
if (axis >= joysticks[stick-1]->axes().size()) {
wpi_setWPIErrorWithContext(ParameterOutOfRange, "invalid axis");
return false;
}
}
CRITICAL_REGION(m_joystickSemaphore)
if (joysticks[stick-1] == NULL || axis >= joysticks[stick-1]->axes().size())
{
return 0.0;
}
return joysticks[stick-1]->axes(axis-1);
END_REGION
}
return joysticks[stick-1] != NULL ? joysticks[stick-1]->axes(axis-1) : 0.0;
END_REGION
/**
* The state of a specific button (1 - 12) on the joystick.
* This method only works in simulation, but is more efficient than GetStickButtons.
*
* @param stick The joystick to read.
* @param button The button number to check.
* @return If the button is pressed.
*/
bool DriverStation::GetStickButton(uint32_t stick, uint32_t button)
{
if (stick < 1 || stick > 4)
{
wpi_setWPIErrorWithContext(ParameterOutOfRange, "stick must be between 1 and 4");
return false;
}
CRITICAL_REGION(m_joystickSemaphore)
if (joysticks[stick-1] == NULL || button >= joysticks[stick-1]->buttons().size())
{
return false;
}
return joysticks[stick-1]->buttons(button-1);
END_REGION
}
/**
@@ -136,20 +160,25 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
* @param stick The joystick to read.
* @return The state of the buttons on the joystick.
*/
bool DriverStation::GetStickButtons(uint32_t stick, uint32_t button)
short DriverStation::GetStickButtons(uint32_t stick)
{
if (stick < 1 || stick > 4) {
if (stick < 1 || stick > 4)
{
wpi_setWPIErrorWithContext(ParameterOutOfRange, "stick must be between 1 and 4");
return false;
}
CRITICAL_REGION(m_joystickSemaphore)
if (button >= joysticks[stick-1]->buttons().size()) {
wpi_setWPIErrorWithContext(ParameterOutOfRange, "invalid button");
return false;
}
return joysticks[stick-1] != NULL ? joysticks[stick-1]->buttons(button-1) : false;
END_REGION
}
short btns = 0, btnid;
CRITICAL_REGION(m_joystickSemaphore)
msgs::JoystickPtr joy = joysticks[stick-1];
for (btnid = 0; btnid < joy->buttons().size() && btnid < 12; btnid++)
{
if (joysticks[stick-1]->buttons(btnid))
{
btns |= (1 << btnid);
}
}
return btns;
END_REGION
}
// 5V divided by 10 bits

2
wpilibc/wpilibC++Sim/src/Joystick.cpp
View File

@@ -221,7 +221,7 @@ bool Joystick::GetBumper(JoystickHand hand)
**/
bool Joystick::GetRawButton(uint32_t button)
{
return m_ds->GetStickButtons(m_port, button);
return m_ds->GetStickButton(m_port, button);
}
/**