Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed periodic voltage status message"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-07-02 10:42:04 -07:00
committed by Gerrit Code Review
parent 244ee8d920 b97d2eb0c3
commit 37ebcabc4a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/wpilibC++/lib/CANJaguar.cpp
View File

@@ -504,7 +504,7 @@ void CANJaguar::setupPeriodicStatus() {
// temperature.
static const uint8_t kMessage0Data[] = {
LM_PSTAT_VOLTBUS_B0, LM_PSTAT_VOLTBUS_B1,
LM_PSTAT_VOLTOUT_B0, LM_PSTAT_VOLTOUT_B1,
LM_PSTAT_VOUT_B0, LM_PSTAT_VOUT_B1,
LM_PSTAT_CURRENT_B0, LM_PSTAT_CURRENT_B1,
LM_PSTAT_TEMP_B0, LM_PSTAT_TEMP_B1
};

2
wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java
View File

@@ -1749,7 +1749,7 @@ public class CANJaguar implements MotorSafety, PIDOutput, SpeedController, LiveW
// temperature.
final byte[] kMessage0Data = new byte[] {
CANJNI.LM_PSTAT_VOLTBUS_B0, CANJNI.LM_PSTAT_VOLTBUS_B1,
CANJNI.LM_PSTAT_VOLTOUT_B0, CANJNI.LM_PSTAT_VOLTOUT_B1,
CANJNI.LM_PSTAT_VOUT_B0, CANJNI.LM_PSTAT_VOUT_B1,
CANJNI.LM_PSTAT_CURRENT_B0, CANJNI.LM_PSTAT_CURRENT_B1,
CANJNI.LM_PSTAT_TEMP_B0, CANJNI.LM_PSTAT_TEMP_B1
};