From 6159fde98eb292ea0970d0281cf62e225aa97586 Mon Sep 17 00:00:00 2001 From: Brad Miller Date: Fri, 20 Feb 2015 18:35:38 -0500 Subject: [PATCH] Set POV values on error to return -1 rather than 0 AND bump the version number (artf4005) Change-Id: I6fffb693a8e58427086b9f9a673cd70bebdbca33 --- wpilibc/wpilibC++Devices/src/DriverStation.cpp | 4 ++-- wpilibc/wpilibC++Devices/src/RobotBase.cpp | 2 +- .../src/main/java/edu/wpi/first/wpilibj/DriverStation.java | 2 +- .../src/main/java/edu/wpi/first/wpilibj/RobotBase.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wpilibc/wpilibC++Devices/src/DriverStation.cpp b/wpilibc/wpilibC++Devices/src/DriverStation.cpp index 2b9496c8b1..d2a6228026 100644 --- a/wpilibc/wpilibC++Devices/src/DriverStation.cpp +++ b/wpilibc/wpilibC++Devices/src/DriverStation.cpp @@ -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]; diff --git a/wpilibc/wpilibC++Devices/src/RobotBase.cpp b/wpilibc/wpilibC++Devices/src/RobotBase.cpp index 2f94c99a1b..ac9ca0be97 100644 --- a/wpilibc/wpilibC++Devices/src/RobotBase.cpp +++ b/wpilibc/wpilibC++Devices/src/RobotBase.cpp @@ -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); } diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java index ae268131b3..8a35d256bb 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DriverStation.java @@ -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]; diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 005db3c39d..04802e5d01 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -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();