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

Changed joystick port numbers to be zero-based for C++ and Java.

Browse Source 
Change-Id: Ifd55e8654be3b15abbe7460d2e9e6fff8acd9977
This commit is contained in:
Brad Miller
2014-10-01 11:25:51 -04:00
parent 7e2c68214d
commit 1cef27134e
11 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GearsBot/src/OI.cpp
View File

@@ -19,7 +19,7 @@ OI::OI() {
SmartDashboard::PutData("Open Claw", new OpenClaw());
SmartDashboard::PutData("Close Claw", new CloseClaw());
joy= new Joystick(1);
joy= new Joystick(0);
// Create some buttons

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GettingStarted/src/Robot.cpp
View File

@@ -11,7 +11,7 @@ class Robot: public IterativeRobot
public:
Robot() :
myRobot(0, 1), // these must be initialized in the same order
stick(1), // as they are declared above.
stick(0), // as they are declared above.
lw(NULL),
autoLoopCounter(0)
{

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/OI.cpp
View File

@@ -10,7 +10,7 @@
#include "Commands/SetCollectionSpeed.h"
OI::OI() {
joystick = new Joystick(1);
joystick = new Joystick(0);
R1 = new JoystickButton(joystick, 12);
R1->WhenPressed(new LowGoal());

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/sample/Robot.cpp
View File

@@ -18,7 +18,7 @@ class Robot: public SampleRobot
public:
Robot() :
myRobot(0, 1), // these must be initialized in the same order
stick(1) // as they are declared above.
stick(0) // as they are declared above.
{
myRobot.SetExpiration(0.1);
}

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/GearsBot/src/org/usfirst/frc/team190/robot/OI.java
View File

@@ -12,7 +12,7 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
* interface to the commands and command groups that allow control of the robot.
*/
public class OI {
private Joystick joy = new Joystick(1);
private Joystick joy = new Joystick(0);
public OI() {
// Put Some buttons on the SmartDashboard

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/GettingStarted/src/org/usfirst/frc/team190/robot/Robot.java
View File

@@ -23,7 +23,7 @@ public class Robot extends IterativeRobot {
*/
public void robotInit() {
myRobot = new RobotDrive(0,1);
stick = new Joystick(1);
stick = new Joystick(0);
}
/**

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/PacGoat/src/org/usfirst/frc/team190/pacgoat/OI.java
View File

@@ -23,7 +23,7 @@ public class OI {
public Joystick joystick;
public OI() {
joystick = new Joystick(1);
joystick = new Joystick(0);
new JoystickButton(joystick, 12).whenPressed(new LowGoal());
new JoystickButton(joystick, 10).whenPressed(new Collect());

2
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/sample/Robot.java
View File

@@ -30,7 +30,7 @@ public class Robot extends SampleRobot {
public Robot() {
myRobot = new RobotDrive(0, 1);
myRobot.setExpiration(0.1);
stick = new Joystick(1);
stick = new Joystick(0);
}
/**

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

@@ -179,7 +179,7 @@ float DriverStation::GetBatteryVoltage()
*/
float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
{
if (stick < 1 || stick > kJoystickPorts)
if (stick >= kJoystickPorts)
{
wpi_setWPIError(BadJoystickIndex);
return 0;
@@ -191,7 +191,7 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
return 0.0f;
}
int8_t value = m_joystickAxes[stick - 1].axes[axis - 1];
int8_t value = m_joystickAxes[stick].axes[axis - 1];
if(value < 0)
{
@@ -212,13 +212,13 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
*/
short DriverStation::GetStickButtons(uint32_t stick)
{
if (stick < 1 || stick > kJoystickPorts)
if (stick >= kJoystickPorts)
{
wpi_setWPIError(BadJoystickIndex);
return 0;
}
return m_joystickButtons[stick - 1];
return m_joystickButtons[stick];
}
bool DriverStation::IsEnabled()

12
wpilibc/wpilibC++Devices/src/Joystick.cpp
View File

@@ -73,8 +73,12 @@ void Joystick::InitJoystick(uint32_t numAxisTypes, uint32_t numButtonTypes)
joysticks[i] = NULL;
joySticksInitialized = true;
}
joysticks[m_port - 1] = this;
if (m_port >= DriverStation::kJoystickPorts) {
wpi_setWPIError(BadJoystickIndex);
} else {
joysticks[m_port] = this;
}
m_ds = DriverStation::GetInstance();
m_axes = new uint32_t[numAxisTypes];
m_buttons = new uint32_t[numButtonTypes];
@@ -82,11 +86,11 @@ void Joystick::InitJoystick(uint32_t numAxisTypes, uint32_t numButtonTypes)
Joystick * Joystick::GetStickForPort(uint32_t port)
{
Joystick *stick = joysticks[port - 1];
Joystick *stick = joysticks[port];
if (stick == NULL)
{
stick = new Joystick(port);
joysticks[port - 1] = stick;
joysticks[port] = stick;
}
return stick;
}

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

@@ -224,15 +224,15 @@ public class DriverStation implements RobotState.Interface {
* @return The value of the axis on the joystick.
*/
public double getStickAxis(int stick, int axis) {
if(stick < 1 || stick > kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 1-4");
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-3");
}
if (axis < 1 || axis > kJoystickAxes) {
throw new RuntimeException("Joystick axis is out of range");
}
byte value = (byte)m_joystickAxes[stick - 1][axis - 1];
byte value = (byte)m_joystickAxes[stick][axis - 1];
if(value < 0) {
return value / 128.0;
@@ -249,11 +249,11 @@ public class DriverStation implements RobotState.Interface {
* @return The state of the buttons on the joystick.
*/
public int getStickButtons(final int stick) {
if(stick < 1 || stick > kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 1-4");
if(stick < 0 || stick >= kJoystickPorts) {
throw new RuntimeException("Joystick index is out of range, should be 0-3");
}
return (int)m_joystickButtons[stick - 1];
return (int)m_joystickButtons[stick];
}
/**