Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +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

11
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java
View File

@@ -17,7 +17,8 @@ import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable;
import edu.wpi.first.wpilibj.tables.ITable;
/**
* Class for getting voltage, current, and temperature from the CAN PDP
* Class for getting voltage, current, temperature, power and energy from the CAN PDP.
* The PDP must be at CAN Address 0.
* @author Thomas Clark
*/
public class PowerDistributionPanel extends SensorBase implements LiveWindowSendable {
@@ -26,7 +27,7 @@ public class PowerDistributionPanel extends SensorBase implements LiveWindowSend
/**
* Query the input voltage of the PDP
* @return The voltage of the PDP
* @return The voltage of the PDP in volts
*/
public double getVoltage() {
ByteBuffer status = ByteBuffer.allocateDirect(4);
@@ -67,7 +68,7 @@ public class PowerDistributionPanel extends SensorBase implements LiveWindowSend
/**
* Query the current of all monitored PDP channels (0-15)
* @return The current of all the channels
* @return The current of all the channels in Amperes
*/
public double getTotalCurrent(){
ByteBuffer status = ByteBuffer.allocateDirect(4);
@@ -80,7 +81,7 @@ public class PowerDistributionPanel extends SensorBase implements LiveWindowSend
/**
* Query the total power drawn from the monitored PDP channels
* @return the total power
* @return the total power in Watts
*/
public double getTotalPower(){
ByteBuffer status = ByteBuffer.allocateDirect(4);
@@ -94,7 +95,7 @@ public class PowerDistributionPanel extends SensorBase implements LiveWindowSend
/**
* Query the total energy drawn from the monitored PDP channels
* @return the total power
* @return the total energy in Joules
*/
public double getTotalEnergy(){
ByteBuffer status = ByteBuffer.allocateDirect(4);