From b97d2eb0c3fea9c0d9a81bdc9963ec60dd8dade0 Mon Sep 17 00:00:00 2001 From: thomasclark Date: Wed, 2 Jul 2014 12:14:49 -0400 Subject: [PATCH] Fixed periodic voltage status message Previously, the voltage was requested as a percentage and decoded as a number of volts, which resulted in values being scaled wrong. The correct message is requested now. Change-Id: I5e81c7a4a2e2698f2e8a84ba747217e0e14f7676 --- wpilibc/wpilibC++/lib/CANJaguar.cpp | 2 +- .../src/main/java/edu/wpi/first/wpilibj/CANJaguar.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibc/wpilibC++/lib/CANJaguar.cpp b/wpilibc/wpilibC++/lib/CANJaguar.cpp index 5c1302f613..aabc7253f4 100644 --- a/wpilibc/wpilibC++/lib/CANJaguar.cpp +++ b/wpilibc/wpilibC++/lib/CANJaguar.cpp @@ -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 }; diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java index 3110745642..9cd5262b12 100644 --- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java +++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/CANJaguar.java @@ -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 };