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

Synchronize access to buffered Joystick data.

Browse Source 
Change-Id: Iae453872e89c7b6364d486a6bbc8b210c94defee
This commit is contained in:
Peter Johnson
2014-12-13 02:12:53 -08:00
committed by Brad Miller
parent 0427fc34c4
commit e655072efc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ public class DriverStation implements RobotState.Interface {
* @param axis The analog axis value to read from the joystick.
* @return The value of the axis on the joystick.
*/
public double getStickAxis(int stick, int axis) {
public synchronized double getStickAxis(int stick, int axis) {
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-5");
}
@@ -237,7 +237,7 @@ public class DriverStation implements RobotState.Interface {
*
* @param stick The joystick port number
*/
public int getStickAxisCount(int stick){
public synchronized int getStickAxisCount(int stick){
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-5");
@@ -251,7 +251,7 @@ public class DriverStation implements RobotState.Interface {
*
* @return the angle of the POV in degrees, or -1 if the POV is not pressed.
*/
public int getStickPOV(int stick, int pov) {
public synchronized int getStickPOV(int stick, int pov) {
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-5");
}
@@ -273,7 +273,7 @@ public class DriverStation implements RobotState.Interface {
*
* @param stick The joystick port number
*/
public int getStickPOVCount(int stick){
public synchronized int getStickPOVCount(int stick){
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-5");
@@ -289,7 +289,7 @@ public class DriverStation implements RobotState.Interface {
* @param stick The joystick to read.
* @return The state of the buttons on the joystick.
*/
public boolean getStickButton(final int stick, byte button) {
public synchronized boolean getStickButton(final int stick, byte button) {
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-3");
}
@@ -312,7 +312,7 @@ public class DriverStation implements RobotState.Interface {
*
* @param stick the joystick port number
*/
public int getStickButtonCount(int stick){
public synchronized int getStickButtonCount(int stick){
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-3");