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

Fix HALGetJoystickDescriptor().

Browse Source 
This reverts the previous commit instead fixing it at the root
HALGetJoystickDescriptor function, which also fixes use of that function
by the C++ DriverStation class.

Change-Id: I1f203a015d8f10d119c61635def2822bf124754c
This commit is contained in:
Peter Johnson
2016-01-14 21:49:50 -08:00
parent f79ed1ab44
commit 83f902f2f6
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hal/lib/Shared/HAL.cpp
View File

@@ -37,6 +37,12 @@ int HALGetJoystickButtons(uint8_t joystickNum, HALJoystickButtons *buttons)
int HALGetJoystickDescriptor(uint8_t joystickNum, HALJoystickDescriptor *desc) int HALGetJoystickDescriptor(uint8_t joystickNum, HALJoystickDescriptor *desc)
{ {
desc->isXbox = 0;
desc->type = -1;
desc->name[0] = '\0';
desc->axisCount = 0;
desc->buttonCount = 0;
desc->povCount = 0;
return FRC_NetworkCommunication_getJoystickDesc(joystickNum, &desc->isXbox, &desc->type, (char *)(&desc->name), return FRC_NetworkCommunication_getJoystickDesc(joystickNum, &desc->isXbox, &desc->type, (char *)(&desc->name),
&desc->axisCount, (uint8_t *)&desc->axisTypes, &desc->buttonCount, &desc->povCount); &desc->axisCount, (uint8_t *)&desc->axisTypes, &desc->buttonCount, &desc->povCount);
} }
@@ -44,9 +50,6 @@ int HALGetJoystickDescriptor(uint8_t joystickNum, HALJoystickDescriptor *desc)
int HALGetJoystickIsXbox(uint8_t joystickNum) int HALGetJoystickIsXbox(uint8_t joystickNum)
{ {
HALJoystickDescriptor joystickDesc; HALJoystickDescriptor joystickDesc;
joystickDesc.isXbox = 0;
joystickDesc.type = -1;
joystickDesc.name[0] = '\0';
if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0) if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0)
{ {
return 0; return 0;
@@ -59,9 +62,6 @@ int HALGetJoystickIsXbox(uint8_t joystickNum)
int HALGetJoystickType(uint8_t joystickNum) int HALGetJoystickType(uint8_t joystickNum)
{ {
HALJoystickDescriptor joystickDesc; HALJoystickDescriptor joystickDesc;
joystickDesc.isXbox = 0;
joystickDesc.type = -1;
joystickDesc.name[0] = '\0';
if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0) if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0)
{ {
return -1; return -1;
@@ -74,9 +74,6 @@ int HALGetJoystickType(uint8_t joystickNum)
char* HALGetJoystickName(uint8_t joystickNum) char* HALGetJoystickName(uint8_t joystickNum)
{ {
HALJoystickDescriptor joystickDesc; HALJoystickDescriptor joystickDesc;
joystickDesc.isXbox = 0;
joystickDesc.type = -1;
joystickDesc.name[0] = '\0';
if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0) if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0)
{ {
char* name = (char*)std::malloc(1); char* name = (char*)std::malloc(1);
@@ -94,9 +91,6 @@ char* HALGetJoystickName(uint8_t joystickNum)
int HALGetJoystickAxisType(uint8_t joystickNum, uint8_t axis) int HALGetJoystickAxisType(uint8_t joystickNum, uint8_t axis)
{ {
HALJoystickDescriptor joystickDesc; HALJoystickDescriptor joystickDesc;
joystickDesc.isXbox = 0;
joystickDesc.type = -1;
joystickDesc.name[0] = '\0';
if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0) if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0)
{ {
return -1; return -1;