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

Ran formatter again (#45)

Browse Source 
The previous wpilibc reformat missed an issue with CANTalon.h, and a patch merged since then didn't run the formatter.
This commit is contained in:
Tyler Veness
2016-05-22 21:39:33 -07:00
committed by Peter Johnson
parent e71f454b9d
commit 0d655d7cec
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wpilibc/athena/src/DriverStation.cpp
View File

@@ -33,14 +33,17 @@ const uint32_t DriverStation::kJoystickPorts;
* This is only called once the first time GetInstance() is called
*/
DriverStation::DriverStation() {
m_joystickAxes = std::make_unique<HALJoystickAxes[]> (kJoystickPorts);
m_joystickPOVs = std::make_unique<HALJoystickPOVs[]> (kJoystickPorts);
m_joystickButtons = std::make_unique<HALJoystickButtons[]> (kJoystickPorts);
m_joystickDescriptor = std::make_unique<HALJoystickDescriptor[]> (kJoystickPorts);
m_joystickAxesCache = std::make_unique<HALJoystickAxes[]> (kJoystickPorts);
m_joystickPOVsCache = std::make_unique<HALJoystickPOVs[]> (kJoystickPorts);
m_joystickButtonsCache = std::make_unique<HALJoystickButtons[]> (kJoystickPorts);
m_joystickDescriptorCache = std::make_unique<HALJoystickDescriptor[]> (kJoystickPorts);
m_joystickAxes = std::make_unique<HALJoystickAxes[]>(kJoystickPorts);
m_joystickPOVs = std::make_unique<HALJoystickPOVs[]>(kJoystickPorts);
m_joystickButtons = std::make_unique<HALJoystickButtons[]>(kJoystickPorts);
m_joystickDescriptor =
std::make_unique<HALJoystickDescriptor[]>(kJoystickPorts);
m_joystickAxesCache = std::make_unique<HALJoystickAxes[]>(kJoystickPorts);
m_joystickPOVsCache = std::make_unique<HALJoystickPOVs[]>(kJoystickPorts);
m_joystickButtonsCache =
std::make_unique<HALJoystickButtons[]>(kJoystickPorts);
m_joystickDescriptorCache =
std::make_unique<HALJoystickDescriptor[]>(kJoystickPorts);
// All joysticks should default to having zero axes, povs and buttons, so
// uninitialized memory doesn't get sent to speed controllers.
@@ -303,7 +306,7 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis) {
"Joystick Axis missing, check if all controllers are plugged in");
return 0.0f;
}
return m_joystickAxes[stick].axes[axis];
}