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

Changed joystick port numbers to be zero-based for C++ and Java.

Browse Source 
Change-Id: Ifd55e8654be3b15abbe7460d2e9e6fff8acd9977
This commit is contained in:
Brad Miller
2014-10-01 11:25:51 -04:00
parent 7e2c68214d
commit 1cef27134e
11 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@ float DriverStation::GetBatteryVoltage()
*/
float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
{
if (stick < 1 || stick > kJoystickPorts)
if (stick >= kJoystickPorts)
{
wpi_setWPIError(BadJoystickIndex);
return 0;
@@ -191,7 +191,7 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
return 0.0f;
}
int8_t value = m_joystickAxes[stick - 1].axes[axis - 1];
int8_t value = m_joystickAxes[stick].axes[axis - 1];
if(value < 0)
{
@@ -212,13 +212,13 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
*/
short DriverStation::GetStickButtons(uint32_t stick)
{
if (stick < 1 || stick > kJoystickPorts)
if (stick >= kJoystickPorts)
{
wpi_setWPIError(BadJoystickIndex);
return 0;
}
return m_joystickButtons[stick - 1];
return m_joystickButtons[stick];
}
bool DriverStation::IsEnabled()