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. */
/*----------------------------------------------------------------------------*/
@@ -13,137 +14,134 @@
#include "LiveWindow/LiveWindow.h"
#include "networktables/NetworkTable.h"
SampleRobot::SampleRobot()
: m_robotMainOverridden (true)
{
}
SampleRobot::SampleRobot() : m_robotMainOverridden(true) {}
/**
* Robot-wide initialization code should go here.
*
* Programmers should override this method for default Robot-wide initialization which will
*
* Programmers should override this method for default Robot-wide initialization
* which will
* be called each time the robot enters the disabled state.
*/
void SampleRobot::RobotInit()
{
printf("Default %s() method... Override me!\n", __FUNCTION__);
void SampleRobot::RobotInit() {
printf("Default %s() method... Override me!\n", __FUNCTION__);
}
/**
* Disabled should go here.
* Programmers should override this method to run code that should run while the field is
* Programmers should override this method to run code that should run while the
* field is
* disabled.
*/
void SampleRobot::Disabled()
{
printf("Default %s() method... Override me!\n", __FUNCTION__);
void SampleRobot::Disabled() {
printf("Default %s() method... Override me!\n", __FUNCTION__);
}
/**
* Autonomous should go here.
* Programmers should override this method to run code that should run while the field is
* in the autonomous period. This will be called once each time the robot enters the
* Programmers should override this method to run code that should run while the
* field is
* in the autonomous period. This will be called once each time the robot enters
* the
* autonomous state.
*/
void SampleRobot::Autonomous()
{
printf("Default %s() method... Override me!\n", __FUNCTION__);
void SampleRobot::Autonomous() {
printf("Default %s() method... Override me!\n", __FUNCTION__);
}
/**
* Operator control (tele-operated) code should go here.
* Programmers should override this method to run code that should run while the field is
* in the Operator Control (tele-operated) period. This is called once each time the robot
* Programmers should override this method to run code that should run while the
* field is
* in the Operator Control (tele-operated) period. This is called once each time
* the robot
* enters the teleop state.
*/
void SampleRobot::OperatorControl()
{
printf("Default %s() method... Override me!\n", __FUNCTION__);
void SampleRobot::OperatorControl() {
printf("Default %s() method... Override me!\n", __FUNCTION__);
}
/**
* Test program should go here.
* Programmers should override this method to run code that executes while the robot is
* Programmers should override this method to run code that executes while the
* robot is
* in test mode. This will be called once whenever the robot enters test mode
*/
void SampleRobot::Test()
{
printf("Default %s() method... Override me!\n", __FUNCTION__);
void SampleRobot::Test() {
printf("Default %s() method... Override me!\n", __FUNCTION__);
}
/**
* Robot main program for free-form programs.
*
* This should be overridden by user subclasses if the intent is to not use the Autonomous() and
* OperatorControl() methods. In that case, the program is responsible for sensing when to run
*
* This should be overridden by user subclasses if the intent is to not use the
* Autonomous() and
* OperatorControl() methods. In that case, the program is responsible for
* sensing when to run
* the autonomous and operator control functions in their program.
*
* This method will be called immediately after the constructor is called. If it has not been
* overridden by a user subclass (i.e. the default version runs), then the Autonomous() and
*
* This method will be called immediately after the constructor is called. If it
* has not been
* overridden by a user subclass (i.e. the default version runs), then the
* Autonomous() and
* OperatorControl() methods will be called.
*/
void SampleRobot::RobotMain()
{
m_robotMainOverridden = false;
}
void SampleRobot::RobotMain() { m_robotMainOverridden = false; }
/**
* Start a competition.
* This code needs to track the order of the field starting to ensure that everything happens
* in the right order. Repeatedly run the correct method, either Autonomous or OperatorControl
* or Test when the robot is enabled. After running the correct method, wait for some state to
* change, either the other mode starts or the robot is disabled. Then go back and wait for the
* This code needs to track the order of the field starting to ensure that
* everything happens
* in the right order. Repeatedly run the correct method, either Autonomous or
* OperatorControl
* or Test when the robot is enabled. After running the correct method, wait for
* some state to
* change, either the other mode starts or the robot is disabled. Then go back
* and wait for the
* robot to be enabled again.
*/
void SampleRobot::StartCompetition()
{
LiveWindow *lw = LiveWindow::GetInstance();
void SampleRobot::StartCompetition() {
LiveWindow *lw = LiveWindow::GetInstance();
HALReport(HALUsageReporting::kResourceType_Framework, HALUsageReporting::kFramework_Simple);
HALReport(HALUsageReporting::kResourceType_Framework,
HALUsageReporting::kFramework_Simple);
SmartDashboard::init();
NetworkTable::GetTable("LiveWindow")->GetSubTable("~STATUS~")->PutBoolean("LW Enabled", false);
SmartDashboard::init();
NetworkTable::GetTable("LiveWindow")
->GetSubTable("~STATUS~")
->PutBoolean("LW Enabled", false);
RobotMain();
if (!m_robotMainOverridden)
{
// first and one-time initialization
lw->SetEnabled(false);
RobotInit();
RobotMain();
while (true)
{
if (IsDisabled())
{
m_ds->InDisabled(true);
Disabled();
m_ds->InDisabled(false);
while (IsDisabled()) m_ds->WaitForData();
}
else if (IsAutonomous())
{
m_ds->InAutonomous(true);
Autonomous();
m_ds->InAutonomous(false);
while (IsAutonomous() && IsEnabled()) m_ds->WaitForData();
}
else if (IsTest())
{
lw->SetEnabled(true);
m_ds->InTest(true);
Test();
m_ds->InTest(false);
while (IsTest() && IsEnabled()) m_ds->WaitForData();
lw->SetEnabled(false);
}
else
{
m_ds->InOperatorControl(true);
OperatorControl();
m_ds->InOperatorControl(false);
while (IsOperatorControl() && IsEnabled()) m_ds->WaitForData();
}
}
}
if (!m_robotMainOverridden) {
// first and one-time initialization
lw->SetEnabled(false);
RobotInit();
while (true) {
if (IsDisabled()) {
m_ds->InDisabled(true);
Disabled();
m_ds->InDisabled(false);
while (IsDisabled()) m_ds->WaitForData();
} else if (IsAutonomous()) {
m_ds->InAutonomous(true);
Autonomous();
m_ds->InAutonomous(false);
while (IsAutonomous() && IsEnabled()) m_ds->WaitForData();
} else if (IsTest()) {
lw->SetEnabled(true);
m_ds->InTest(true);
Test();
m_ds->InTest(false);
while (IsTest() && IsEnabled()) m_ds->WaitForData();
lw->SetEnabled(false);
} else {
m_ds->InOperatorControl(true);
OperatorControl();
m_ds->InOperatorControl(false);
while (IsOperatorControl() && IsEnabled()) m_ds->WaitForData();
}
}
}
}