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 2014. All Rights Reserved. */
/* Copyright (c) FIRST 2014. 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. */
/*----------------------------------------------------------------------------*/
@@ -9,195 +10,180 @@
#include "HAL/PDP.hpp"
#include "LiveWindow/LiveWindow.h"
PowerDistributionPanel::PowerDistributionPanel() {
PowerDistributionPanel(0);
}
PowerDistributionPanel::PowerDistributionPanel() { PowerDistributionPanel(0); }
/**
* Initialize the PDP.
*/
PowerDistributionPanel::PowerDistributionPanel(uint8_t module) {
m_table=NULL;
m_module = module;
initializePDP(m_module);
m_table = NULL;
m_module = module;
initializePDP(m_module);
}
/**
* Query the input voltage of the PDP
* @return The voltage of the PDP in volts
*/
double
PowerDistributionPanel::GetVoltage() const {
int32_t status = 0;
double voltage = getPDPVoltage(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return voltage;
double PowerDistributionPanel::GetVoltage() const {
int32_t status = 0;
double voltage = getPDPVoltage(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return voltage;
}
/**
* Query the temperature of the PDP
* @return The temperature of the PDP in degrees Celsius
*/
double
PowerDistributionPanel::GetTemperature() const {
int32_t status = 0;
double temperature = getPDPTemperature(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return temperature;
double PowerDistributionPanel::GetTemperature() const {
int32_t status = 0;
double temperature = getPDPTemperature(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return temperature;
}
/**
* Query the current of a single channel of the PDP
* @return The current of one of the PDP channels (channels 0-15) in Amperes
*/
double
PowerDistributionPanel::GetCurrent(uint8_t channel) const {
int32_t status = 0;
if(!CheckPDPChannel(channel))
{
char buf[64];
snprintf(buf, 64, "PDP Channel %d", channel);
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf);
}
double current = getPDPChannelCurrent(channel, &status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return current;
double PowerDistributionPanel::GetCurrent(uint8_t channel) const {
int32_t status = 0;
if (!CheckPDPChannel(channel)) {
char buf[64];
snprintf(buf, 64, "PDP Channel %d", channel);
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf);
}
double current = getPDPChannelCurrent(channel, &status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return current;
}
/**
* Query the total current of all monitored PDP channels (0-15)
* @return The the total current drawn from the PDP channels in Amperes
*/
double
PowerDistributionPanel::GetTotalCurrent() const {
int32_t status = 0;
double current = getPDPTotalCurrent(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return current;
double PowerDistributionPanel::GetTotalCurrent() const {
int32_t status = 0;
double current = getPDPTotalCurrent(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return current;
}
/**
* Query the total power drawn from the monitored PDP channels
* @return The the total power drawn from the PDP channels in Watts
*/
double
PowerDistributionPanel::GetTotalPower() const {
int32_t status = 0;
double power = getPDPTotalPower(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return power;
double PowerDistributionPanel::GetTotalPower() const {
int32_t status = 0;
double power = getPDPTotalPower(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return power;
}
/**
* Query the total energy drawn from the monitored PDP channels
* @return The the total energy drawn from the PDP channels in Joules
*/
double
PowerDistributionPanel::GetTotalEnergy() const {
int32_t status = 0;
double energy = getPDPTotalEnergy(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return energy;
double PowerDistributionPanel::GetTotalEnergy() const {
int32_t status = 0;
double energy = getPDPTotalEnergy(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
return energy;
}
/**
* Reset the total energy drawn from the PDP
* @see PowerDistributionPanel#GetTotalEnergy
*/
void
PowerDistributionPanel::ResetTotalEnergy() {
int32_t status = 0;
resetPDPTotalEnergy(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
void PowerDistributionPanel::ResetTotalEnergy() {
int32_t status = 0;
resetPDPTotalEnergy(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
}
/**
* Remove all of the fault flags on the PDP
*/
void
PowerDistributionPanel::ClearStickyFaults() {
int32_t status = 0;
clearPDPStickyFaults(&status, m_module);
if(status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
void PowerDistributionPanel::ClearStickyFaults() {
int32_t status = 0;
clearPDPStickyFaults(&status, m_module);
if (status) {
wpi_setWPIErrorWithContext(Timeout, "");
}
}
void PowerDistributionPanel::UpdateTable() {
if (m_table != NULL) {
m_table->PutNumber("Chan0", GetCurrent(0));
m_table->PutNumber("Chan1", GetCurrent(1));
m_table->PutNumber("Chan2", GetCurrent(2));
m_table->PutNumber("Chan3", GetCurrent(3));
m_table->PutNumber("Chan4", GetCurrent(4));
m_table->PutNumber("Chan5", GetCurrent(5));
m_table->PutNumber("Chan6", GetCurrent(6));
m_table->PutNumber("Chan7", GetCurrent(7));
m_table->PutNumber("Chan8", GetCurrent(8));
m_table->PutNumber("Chan9", GetCurrent(9));
m_table->PutNumber("Chan10", GetCurrent(10));
m_table->PutNumber("Chan11", GetCurrent(11));
m_table->PutNumber("Chan12", GetCurrent(12));
m_table->PutNumber("Chan13", GetCurrent(13));
m_table->PutNumber("Chan14", GetCurrent(14));
m_table->PutNumber("Chan15", GetCurrent(15));
m_table->PutNumber("Voltage", GetVoltage());
m_table->PutNumber("TotalCurrent", GetTotalCurrent());
}
if (m_table != NULL) {
m_table->PutNumber("Chan0", GetCurrent(0));
m_table->PutNumber("Chan1", GetCurrent(1));
m_table->PutNumber("Chan2", GetCurrent(2));
m_table->PutNumber("Chan3", GetCurrent(3));
m_table->PutNumber("Chan4", GetCurrent(4));
m_table->PutNumber("Chan5", GetCurrent(5));
m_table->PutNumber("Chan6", GetCurrent(6));
m_table->PutNumber("Chan7", GetCurrent(7));
m_table->PutNumber("Chan8", GetCurrent(8));
m_table->PutNumber("Chan9", GetCurrent(9));
m_table->PutNumber("Chan10", GetCurrent(10));
m_table->PutNumber("Chan11", GetCurrent(11));
m_table->PutNumber("Chan12", GetCurrent(12));
m_table->PutNumber("Chan13", GetCurrent(13));
m_table->PutNumber("Chan14", GetCurrent(14));
m_table->PutNumber("Chan15", GetCurrent(15));
m_table->PutNumber("Voltage", GetVoltage());
m_table->PutNumber("TotalCurrent", GetTotalCurrent());
}
}
void PowerDistributionPanel::StartLiveWindowMode() {
}
void PowerDistributionPanel::StartLiveWindowMode() {}
void PowerDistributionPanel::StopLiveWindowMode() {
}
void PowerDistributionPanel::StopLiveWindowMode() {}
std::string PowerDistributionPanel::GetSmartDashboardType() const {
return "PowerDistributionPanel";
return "PowerDistributionPanel";
}
void PowerDistributionPanel::InitTable(ITable *subTable) {
m_table = subTable;
UpdateTable();
m_table = subTable;
UpdateTable();
}
ITable * PowerDistributionPanel::GetTable() const {
return m_table;
}
ITable *PowerDistributionPanel::GetTable() const { return m_table; }