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

Increase the number of joystick ports to 6.

Browse Source 
Change-Id: I18a29a3a8c8f38b3b21c3e76eead3526b9d02875
This commit is contained in:
Peter Johnson
2014-10-23 23:57:35 -07:00
committed by Brad Miller
parent 003dc0dc2b
commit c58fde19f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/wpilibC++Devices/include/DriverStation.h
View File

@@ -30,7 +30,7 @@ public:
static DriverStation *GetInstance(); static DriverStation *GetInstance();
static void ReportError(std::string error); static void ReportError(std::string error);
static const uint32_t kJoystickPorts = 4; static const uint32_t kJoystickPorts = 6;
float GetStickAxis(uint32_t stick, uint32_t axis); float GetStickAxis(uint32_t stick, uint32_t axis);
int GetStickPOV(uint32_t stick, uint32_t pov); int GetStickPOV(uint32_t stick, uint32_t pov);

2
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
View File

@@ -29,7 +29,7 @@ public class DriverStation implements RobotState.Interface {
/** /**
* Number of Joystick Ports * Number of Joystick Ports
*/ */
public static final int kJoystickPorts = 4; public static final int kJoystickPorts = 6;
/** /**
* Convert from raw values to volts * Convert from raw values to volts
*/ */