Major formatting changes (breaks diffs). No code changes.

The changes made in this commit do not affect any actual code,
    they are purely aesthetic. I ran clang-format with google style
    over all .h/.cpp files in wpilibc that weren't in wpilibC++Sim
    or gtest, and the eclipse formatter over all of the Java files
    using the Google eclipse formatting configuration.

Change-Id: I9627bca0bc103c398ecc1c5ba17467193291ae63
This commit is contained in:
James Kuszmaul
2015-06-25 15:07:55 -04:00
parent bd64d9a7ef
commit 7eb8550bdb
470 changed files with 89798 additions and 77287 deletions

View File

@@ -1,5 +1,6 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) FIRST 2008. All Rights Reserved. */
/* Copyright (c) FIRST 2008. All Rights Reserved.
*/
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib. */
/*----------------------------------------------------------------------------*/
@@ -25,29 +26,29 @@ static bool joySticksInitialized = false;
* Construct an instance of a joystick.
* The joystick index is the usb port on the drivers station.
*
* @param port The port on the driver station that the joystick is plugged into (0-5).
* @param port The port on the driver station that the joystick is plugged into
* (0-5).
*/
Joystick::Joystick(uint32_t port)
: m_ds (NULL)
, m_port (port)
, m_axes (NULL)
, m_buttons (NULL)
, m_outputs (0)
, m_leftRumble (0)
, m_rightRumble (0)
{
InitJoystick(kNumAxisTypes, kNumButtonTypes);
: m_ds(NULL),
m_port(port),
m_axes(NULL),
m_buttons(NULL),
m_outputs(0),
m_leftRumble(0),
m_rightRumble(0) {
InitJoystick(kNumAxisTypes, kNumButtonTypes);
m_axes[kXAxis] = kDefaultXAxis;
m_axes[kYAxis] = kDefaultYAxis;
m_axes[kZAxis] = kDefaultZAxis;
m_axes[kTwistAxis] = kDefaultTwistAxis;
m_axes[kThrottleAxis] = kDefaultThrottleAxis;
m_axes[kXAxis] = kDefaultXAxis;
m_axes[kYAxis] = kDefaultYAxis;
m_axes[kZAxis] = kDefaultZAxis;
m_axes[kTwistAxis] = kDefaultTwistAxis;
m_axes[kThrottleAxis] = kDefaultThrottleAxis;
m_buttons[kTriggerButton] = kDefaultTriggerButton;
m_buttons[kTopButton] = kDefaultTopButton;
m_buttons[kTriggerButton] = kDefaultTriggerButton;
m_buttons[kTopButton] = kDefaultTopButton;
HALReport(HALUsageReporting::kResourceType_Joystick, port);
HALReport(HALUsageReporting::kResourceType_Joystick, port);
}
/**
@@ -60,96 +61,81 @@ Joystick::Joystick(uint32_t port)
* @param numAxisTypes The number of axis types in the enum.
* @param numButtonTypes The number of button types in the enum.
*/
Joystick::Joystick(uint32_t port, uint32_t numAxisTypes, uint32_t numButtonTypes)
: m_ds (NULL)
, m_port (port)
, m_axes (NULL)
, m_buttons (NULL)
{
InitJoystick(numAxisTypes, numButtonTypes);
Joystick::Joystick(uint32_t port, uint32_t numAxisTypes,
uint32_t numButtonTypes)
: m_ds(NULL), m_port(port), m_axes(NULL), m_buttons(NULL) {
InitJoystick(numAxisTypes, numButtonTypes);
}
void Joystick::InitJoystick(uint32_t numAxisTypes, uint32_t numButtonTypes)
{
if ( !joySticksInitialized )
{
for (unsigned i = 0; i < DriverStation::kJoystickPorts; i++)
joysticks[i] = NULL;
joySticksInitialized = true;
}
if (m_port >= DriverStation::kJoystickPorts) {
wpi_setWPIError(BadJoystickIndex);
} else {
joysticks[m_port] = this;
}
void Joystick::InitJoystick(uint32_t numAxisTypes, uint32_t numButtonTypes) {
if (!joySticksInitialized) {
for (unsigned i = 0; i < DriverStation::kJoystickPorts; i++)
joysticks[i] = NULL;
joySticksInitialized = true;
}
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];
m_ds = DriverStation::GetInstance();
m_axes = new uint32_t[numAxisTypes];
m_buttons = new uint32_t[numButtonTypes];
}
Joystick * Joystick::GetStickForPort(uint32_t port)
{
Joystick *stick = joysticks[port];
if (stick == NULL)
{
stick = new Joystick(port);
joysticks[port] = stick;
}
return stick;
Joystick *Joystick::GetStickForPort(uint32_t port) {
Joystick *stick = joysticks[port];
if (stick == NULL) {
stick = new Joystick(port);
joysticks[port] = stick;
}
return stick;
}
Joystick::~Joystick()
{
delete [] m_buttons;
delete [] m_axes;
Joystick::~Joystick() {
delete[] m_buttons;
delete[] m_axes;
}
/**
* Get the X value of the joystick.
* This depends on the mapping of the joystick connected to the current port.
* @param hand This parameter is ignored for the Joystick class and is only here to complete the GenericHID interface.
* @param hand This parameter is ignored for the Joystick class and is only here
* to complete the GenericHID interface.
*/
float Joystick::GetX(JoystickHand hand) const
{
return GetRawAxis(m_axes[kXAxis]);
float Joystick::GetX(JoystickHand hand) const {
return GetRawAxis(m_axes[kXAxis]);
}
/**
* Get the Y value of the joystick.
* This depends on the mapping of the joystick connected to the current port.
* @param hand This parameter is ignored for the Joystick class and is only here to complete the GenericHID interface.
* @param hand This parameter is ignored for the Joystick class and is only here
* to complete the GenericHID interface.
*/
float Joystick::GetY(JoystickHand hand) const
{
return GetRawAxis(m_axes[kYAxis]);
float Joystick::GetY(JoystickHand hand) const {
return GetRawAxis(m_axes[kYAxis]);
}
/**
* Get the Z value of the current joystick.
* This depends on the mapping of the joystick connected to the current port.
*/
float Joystick::GetZ() const
{
return GetRawAxis(m_axes[kZAxis]);
}
float Joystick::GetZ() const { return GetRawAxis(m_axes[kZAxis]); }
/**
* Get the twist value of the current joystick.
* This depends on the mapping of the joystick connected to the current port.
*/
float Joystick::GetTwist() const
{
return GetRawAxis(m_axes[kTwistAxis]);
}
float Joystick::GetTwist() const { return GetRawAxis(m_axes[kTwistAxis]); }
/**
* Get the throttle value of the current joystick.
* This depends on the mapping of the joystick connected to the current port.
*/
float Joystick::GetThrottle() const
{
return GetRawAxis(m_axes[kThrottleAxis]);
float Joystick::GetThrottle() const {
return GetRawAxis(m_axes[kThrottleAxis]);
}
/**
@@ -158,33 +144,36 @@ float Joystick::GetThrottle() const
* @param axis The axis to read, starting at 0.
* @return The value of the axis.
*/
float Joystick::GetRawAxis(uint32_t axis) const
{
return m_ds->GetStickAxis(m_port, axis);
float Joystick::GetRawAxis(uint32_t axis) const {
return m_ds->GetStickAxis(m_port, axis);
}
/**
* For the current joystick, return the axis determined by the argument.
*
* This is for cases where the joystick axis is returned programatically, otherwise one of the
* This is for cases where the joystick axis is returned programatically,
* otherwise one of the
* previous functions would be preferable (for example GetX()).
*
* @param axis The axis to read.
* @return The value of the axis.
*/
float Joystick::GetAxis(AxisType axis) const
{
switch(axis)
{
case kXAxis: return this->GetX();
case kYAxis: return this->GetY();
case kZAxis: return this->GetZ();
case kTwistAxis: return this->GetTwist();
case kThrottleAxis: return this->GetThrottle();
default:
wpi_setWPIError(BadJoystickAxis);
return 0.0;
}
float Joystick::GetAxis(AxisType axis) const {
switch (axis) {
case kXAxis:
return this->GetX();
case kYAxis:
return this->GetY();
case kZAxis:
return this->GetZ();
case kTwistAxis:
return this->GetTwist();
case kThrottleAxis:
return this->GetThrottle();
default:
wpi_setWPIError(BadJoystickAxis);
return 0.0;
}
}
/**
@@ -192,12 +181,12 @@ float Joystick::GetAxis(AxisType axis) const
*
* Look up which button has been assigned to the trigger and read its state.
*
* @param hand This parameter is ignored for the Joystick class and is only here to complete the GenericHID interface.
* @param hand This parameter is ignored for the Joystick class and is only here
* to complete the GenericHID interface.
* @return The state of the trigger.
*/
bool Joystick::GetTrigger(JoystickHand hand) const
{
return GetRawButton(m_buttons[kTriggerButton]);
bool Joystick::GetTrigger(JoystickHand hand) const {
return GetRawButton(m_buttons[kTriggerButton]);
}
/**
@@ -205,36 +194,35 @@ bool Joystick::GetTrigger(JoystickHand hand) const
*
* Look up which button has been assigned to the top and read its state.
*
* @param hand This parameter is ignored for the Joystick class and is only here to complete the GenericHID interface.
* @param hand This parameter is ignored for the Joystick class and is only here
* to complete the GenericHID interface.
* @return The state of the top button.
*/
bool Joystick::GetTop(JoystickHand hand) const
{
return GetRawButton(m_buttons[kTopButton]);
bool Joystick::GetTop(JoystickHand hand) const {
return GetRawButton(m_buttons[kTopButton]);
}
/**
* This is not supported for the Joystick.
* This method is only here to complete the GenericHID interface.
*/
bool Joystick::GetBumper(JoystickHand hand) const
{
// Joysticks don't have bumpers.
return false;
bool Joystick::GetBumper(JoystickHand hand) const {
// Joysticks don't have bumpers.
return false;
}
/**
* Get the button value (starting at button 1)
*
* The buttons are returned in a single 16 bit value with one bit representing the state
* The buttons are returned in a single 16 bit value with one bit representing
* the state
* of each button. The appropriate button is returned as a boolean value.
*
* @param button The button number to be read (starting at 1)
* @return The state of the button.
**/
bool Joystick::GetRawButton(uint32_t button) const
{
return m_ds->GetStickButton(m_port, button);
bool Joystick::GetRawButton(uint32_t button) const {
return m_ds->GetStickButton(m_port, button);
}
/**
@@ -244,7 +232,7 @@ bool Joystick::GetRawButton(uint32_t button) const
* @return the angle of the POV in degrees, or -1 if the POV is not pressed.
*/
int Joystick::GetPOV(uint32_t pov) const {
return m_ds->GetStickPOV(m_port, pov);
return m_ds->GetStickPOV(m_port, pov);
}
/**
@@ -255,15 +243,15 @@ int Joystick::GetPOV(uint32_t pov) const {
* @param button The type of button to read.
* @return The state of the button.
*/
bool Joystick::GetButton(ButtonType button) const
{
switch (button)
{
case kTriggerButton: return GetTrigger();
case kTopButton: return GetTop();
default:
return false;
}
bool Joystick::GetButton(ButtonType button) const {
switch (button) {
case kTriggerButton:
return GetTrigger();
case kTopButton:
return GetTop();
default:
return false;
}
}
/**
@@ -271,29 +259,22 @@ bool Joystick::GetButton(ButtonType button) const
*
* @return the number of axis for the current joystick
*/
int Joystick::GetAxisCount() const
{
return m_ds->GetStickAxisCount(m_port);
}
int Joystick::GetAxisCount() const { return m_ds->GetStickAxisCount(m_port); }
/**
* Get the value of isXbox for the joystick.
*
* @return A boolean that is true if the joystick is an xbox controller.
*/
bool Joystick::GetIsXbox() const
{
return m_ds->GetJoystickIsXbox(m_port);
}
bool Joystick::GetIsXbox() const { return m_ds->GetJoystickIsXbox(m_port); }
/**
* Get the HID type of the controller.
*
* @return the HID type of the controller.
*/
Joystick::HIDType Joystick::GetType() const
{
return static_cast<HIDType>(m_ds->GetJoystickType(m_port));
Joystick::HIDType Joystick::GetType() const {
return static_cast<HIDType>(m_ds->GetJoystickType(m_port));
}
/**
@@ -301,25 +282,20 @@ Joystick::HIDType Joystick::GetType() const
*
* @return the name of the controller.
*/
std::string Joystick::GetName() const
{
return m_ds->GetJoystickName(m_port);
}
std::string Joystick::GetName() const { return m_ds->GetJoystickName(m_port); }
//int Joystick::GetAxisType(uint8_t axis) const
// int Joystick::GetAxisType(uint8_t axis) const
//{
// return m_ds->GetJoystickAxisType(m_port, axis);
//}
/**
* Get the number of axis for a joystick
*
* @return the number of buttons on the current joystick
*/
int Joystick::GetButtonCount() const
{
return m_ds->GetStickButtonCount(m_port);
int Joystick::GetButtonCount() const {
return m_ds->GetStickButtonCount(m_port);
}
/**
@@ -327,11 +303,7 @@ int Joystick::GetButtonCount() const
*
* @return then umber of POVs for the current joystick
*/
int Joystick::GetPOVCount() const
{
return m_ds->GetStickPOVCount(m_port);
}
int Joystick::GetPOVCount() const { return m_ds->GetStickPOVCount(m_port); }
/**
* Get the channel currently associated with the specified axis.
@@ -339,10 +311,7 @@ int Joystick::GetPOVCount() const
* @param axis The axis to look up the channel for.
* @return The channel fr the axis.
*/
uint32_t Joystick::GetAxisChannel(AxisType axis) const
{
return m_axes[axis];
}
uint32_t Joystick::GetAxisChannel(AxisType axis) const { return m_axes[axis]; }
/**
* Set the channel associated with a specified axis.
@@ -350,9 +319,8 @@ uint32_t Joystick::GetAxisChannel(AxisType axis) const
* @param axis The axis to set the channel for.
* @param channel The channel to set the axis to.
*/
void Joystick::SetAxisChannel(AxisType axis, uint32_t channel)
{
m_axes[axis] = channel;
void Joystick::SetAxisChannel(AxisType axis, uint32_t channel) {
m_axes[axis] = channel;
}
/**
@@ -362,7 +330,7 @@ void Joystick::SetAxisChannel(AxisType axis, uint32_t channel)
* @return The magnitude of the direction vector
*/
float Joystick::GetMagnitude() const {
return sqrt(pow(GetX(),2) + pow(GetY(),2) );
return sqrt(pow(GetX(), 2) + pow(GetY(), 2));
}
/**
@@ -371,9 +339,7 @@ float Joystick::GetMagnitude() const {
*
* @return The direction of the vector in radians
*/
float Joystick::GetDirectionRadians() const {
return atan2(GetX(), -GetY());
}
float Joystick::GetDirectionRadians() const { return atan2(GetX(), -GetY()); }
/**
* Get the direction of the vector formed by the joystick and its origin
@@ -385,25 +351,26 @@ float Joystick::GetDirectionRadians() const {
* @return The direction of the vector in degrees
*/
float Joystick::GetDirectionDegrees() const {
return (180/acos(-1))*GetDirectionRadians();
return (180 / acos(-1)) * GetDirectionRadians();
}
/**
* Set the rumble output for the joystick. The DS currently supports 2 rumble values,
* Set the rumble output for the joystick. The DS currently supports 2 rumble
* values,
* left rumble and right rumble
* @param type Which rumble value to set
* @param value The normalized value (0 to 1) to set the rumble to
*/
void Joystick::SetRumble(RumbleType type, float value) {
if (value < 0)
value = 0;
else if (value > 1)
value = 1;
if (type == kLeftRumble)
m_leftRumble = value*65535;
else
m_rightRumble = value*65535;
HALSetJoystickOutputs(m_port, m_outputs, m_leftRumble, m_rightRumble);
if (value < 0)
value = 0;
else if (value > 1)
value = 1;
if (type == kLeftRumble)
m_leftRumble = value * 65535;
else
m_rightRumble = value * 65535;
HALSetJoystickOutputs(m_port, m_outputs, m_leftRumble, m_rightRumble);
}
/**
@@ -411,11 +378,12 @@ void Joystick::SetRumble(RumbleType type, float value) {
* @param outputNumber The index of the output to set (1-32)
* @param value The value to set the output to
*/
void Joystick::SetOutput(uint8_t outputNumber, bool value) {
m_outputs = (m_outputs & ~(1 << (outputNumber-1))) | (value << (outputNumber-1));
HALSetJoystickOutputs(m_port, m_outputs, m_leftRumble, m_rightRumble);
void Joystick::SetOutput(uint8_t outputNumber, bool value) {
m_outputs =
(m_outputs & ~(1 << (outputNumber - 1))) | (value << (outputNumber - 1));
HALSetJoystickOutputs(m_port, m_outputs, m_leftRumble, m_rightRumble);
}
/**
@@ -423,8 +391,6 @@ void Joystick::SetOutput(uint8_t outputNumber, bool value) {
* @param value The 32 bit output value (1 bit for each output)
*/
void Joystick::SetOutputs(uint32_t value) {
m_outputs = value;
HALSetJoystickOutputs(m_port, m_outputs, m_leftRumble, m_rightRumble);
m_outputs = value;
HALSetJoystickOutputs(m_port, m_outputs, m_leftRumble, m_rightRumble);
}