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

Document that PDP must be address 0 and add/fix measurement units

Browse Source 
Change-Id: I4864e3242d8a19ad3dfb7740f23632e2b939ca90
This commit is contained in:
Joe Ross
2015-01-02 16:08:19 -08:00
parent 359a155915
commit 5c342a8e1a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/wpilibC++Devices/src/PowerDistributionPanel.cpp
View File

@@ -18,7 +18,7 @@ PowerDistributionPanel::PowerDistributionPanel() {
/**
* Query the input voltage of the PDP
* @return The voltage of the PDP
* @return The voltage of the PDP in volts
*/
double
PowerDistributionPanel::GetVoltage() {
@@ -93,7 +93,7 @@ PowerDistributionPanel::GetTotalCurrent() {
/**
* Query the total power drawn from the monitored PDP channels
* @return The the total power drawn from the PDP channels in Joules
* @return The the total power drawn from the PDP channels in Watts
*/
double
PowerDistributionPanel::GetTotalPower() {
@@ -110,7 +110,7 @@ PowerDistributionPanel::GetTotalPower() {
/**
* Query the total energy drawn from the monitored PDP channels
* @return The the total energy drawn from the PDP channels in Watts
* @return The the total energy drawn from the PDP channels in Joules
*/
double
PowerDistributionPanel::GetTotalEnergy() {