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

Set POV values on error to return -1 rather than 0 AND bump the version number (artf4005)

Browse Source 
Change-Id: I6fffb693a8e58427086b9f9a673cd70bebdbca33
This commit is contained in:
Brad Miller
2015-02-20 18:35:38 -05:00
parent 605bb45e0c
commit 6159fde98e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,7 +270,7 @@ int DriverStation::GetStickPOV(uint32_t stick, uint32_t pov) {
if (stick >= kJoystickPorts)
{
wpi_setWPIError(BadJoystickIndex);
return 0;
return -1;
}
if (pov >= m_joystickPOVs[stick].count)
@@ -279,7 +279,7 @@ int DriverStation::GetStickPOV(uint32_t stick, uint32_t pov) {
wpi_setWPIError(BadJoystickAxis);
else
ReportJoystickUnpluggedError("WARNING: Joystick POV missing, check if all controllers are plugged in\n");
return 0;
return -1;
}
return m_joystickPOVs[stick].povs[pov];

2
wpilibc/wpilibC++Devices/src/RobotBase.cpp
View File

@@ -65,7 +65,7 @@ RobotBase::RobotBase()
FILE *file = NULL;
file = fopen("/tmp/frc_versions/FRC_Lib_Version.ini", "w");
fputs("2015 C++ 1.1.0", file);
fputs("2015 C++ 1.2.0", file);
if (file != NULL)
fclose(file);
}

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

@@ -267,7 +267,7 @@ public class DriverStation implements RobotState.Interface {
if (pov >= m_joystickPOVs[stick].length) {
reportJoystickUnpluggedError("WARNING: Joystick POV " + pov + " on port " + stick + " not available, check if controller is plugged in\n");
return 0;
return -1;
}
return m_joystickPOVs[stick][pov];

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

@@ -216,7 +216,7 @@ public abstract class RobotBase {
output = new FileOutputStream(file);
output.write("2015 Java 1.1.0".getBytes());
output.write("2015 Java 1.2.0".getBytes());
} catch (IOException ex) {
ex.printStackTrace();