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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

69
wpilibc/wpilibC++Devices/src/BuiltInAccelerometer.cpp
View File

@@ -13,73 +13,58 @@
* Constructor.
* @param range The range the accelerometer will measure
*/
BuiltInAccelerometer::BuiltInAccelerometer(Range range)
: m_table(0)
{
SetRange(range);
BuiltInAccelerometer::BuiltInAccelerometer(Range range) : m_table(0) {
SetRange(range);
HALReport(HALUsageReporting::kResourceType_Accelerometer, 0, 0, "Built-in accelerometer");
LiveWindow::GetInstance()->AddSensor((std::string)"BuiltInAccel",0, this);
HALReport(HALUsageReporting::kResourceType_Accelerometer, 0, 0,
"Built-in accelerometer");
LiveWindow::GetInstance()->AddSensor((std::string) "BuiltInAccel", 0, this);
}
BuiltInAccelerometer::~BuiltInAccelerometer()
{
}
BuiltInAccelerometer::~BuiltInAccelerometer() {}
/** {@inheritdoc} */
void BuiltInAccelerometer::SetRange(Range range)
{
if(range == kRange_16G)
{
wpi_setWPIErrorWithContext(ParameterOutOfRange, "16G range not supported (use k2G, k4G, or k8G)");
}
void BuiltInAccelerometer::SetRange(Range range) {
if (range == kRange_16G) {
wpi_setWPIErrorWithContext(
ParameterOutOfRange, "16G range not supported (use k2G, k4G, or k8G)");
}
setAccelerometerActive(false);
setAccelerometerRange((AccelerometerRange)range);
setAccelerometerActive(true);
setAccelerometerActive(false);
setAccelerometerRange((AccelerometerRange)range);
setAccelerometerActive(true);
}
/**
* @return The acceleration of the RoboRIO along the X axis in g-forces
*/
double BuiltInAccelerometer::GetX()
{
return getAccelerometerX();
}
double BuiltInAccelerometer::GetX() { return getAccelerometerX(); }
/**
* @return The acceleration of the RoboRIO along the Y axis in g-forces
*/
double BuiltInAccelerometer::GetY()
{
return getAccelerometerY();
}
double BuiltInAccelerometer::GetY() { return getAccelerometerY(); }
/**
* @return The acceleration of the RoboRIO along the Z axis in g-forces
*/
double BuiltInAccelerometer::GetZ()
{
return getAccelerometerZ();
}
double BuiltInAccelerometer::GetZ() { return getAccelerometerZ(); }
std::string BuiltInAccelerometer::GetSmartDashboardType() const {
return "3AxisAccelerometer";
return "3AxisAccelerometer";
}
void BuiltInAccelerometer::InitTable(ITable *subtable) {
m_table = subtable;
UpdateTable();
void BuiltInAccelerometer::InitTable(ITable* subtable) {
m_table = subtable;
UpdateTable();
}
void BuiltInAccelerometer::UpdateTable() {
if (m_table != NULL) {
m_table->PutNumber("X", GetX());
m_table->PutNumber("Y", GetY());
m_table->PutNumber("Z", GetZ());
}
if (m_table != NULL) {
m_table->PutNumber("X", GetX());
m_table->PutNumber("Y", GetY());
m_table->PutNumber("Z", GetZ());
}
}
ITable* BuiltInAccelerometer::GetTable() const {
return m_table;
}
ITable* BuiltInAccelerometer::GetTable() const { return m_table; }