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

Fixed accidental confusion between seconds/milliseconds.

Browse Source 
get* in CANTalon would've blocked for 1 sec instead of 1ms.

Change-Id: I1b6fce24329e2789053372181dbef5c28f4b747a
This commit is contained in:
James Kuszmaul
2014-12-05 19:16:53 -05:00
parent 568b842c73
commit 66622b43e7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java
View File

@@ -365,7 +365,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_P); m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_P);
// Briefly wait for new values from the Talon. // Briefly wait for new values from the Talon.
Timer.delay(1); Timer.delay(0.001);
long pp = CanTalonJNI.new_doublep(); long pp = CanTalonJNI.new_doublep();
m_impl.GetPgain(m_profile, new SWIGTYPE_p_double(pp, true)); m_impl.GetPgain(m_profile, new SWIGTYPE_p_double(pp, true));
@@ -384,7 +384,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_I); m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_I);
// Briefly wait for new values from the Talon. // Briefly wait for new values from the Talon.
Timer.delay(1); Timer.delay(0.001);
long ip = CanTalonJNI.new_doublep(); long ip = CanTalonJNI.new_doublep();
m_impl.GetIgain(m_profile, new SWIGTYPE_p_double(ip, true)); m_impl.GetIgain(m_profile, new SWIGTYPE_p_double(ip, true));
@@ -403,7 +403,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_D); m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_D);
// Briefly wait for new values from the Talon. // Briefly wait for new values from the Talon.
Timer.delay(1); Timer.delay(0.001);
long dp = CanTalonJNI.new_doublep(); long dp = CanTalonJNI.new_doublep();
m_impl.GetDgain(m_profile, new SWIGTYPE_p_double(dp, true)); m_impl.GetDgain(m_profile, new SWIGTYPE_p_double(dp, true));
@@ -422,7 +422,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_F); m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_F);
// Briefly wait for new values from the Talon. // Briefly wait for new values from the Talon.
Timer.delay(1); Timer.delay(0.001);
long fp = CanTalonJNI.new_doublep(); long fp = CanTalonJNI.new_doublep();
m_impl.GetFgain(m_profile, new SWIGTYPE_p_double(fp, true)); m_impl.GetFgain(m_profile, new SWIGTYPE_p_double(fp, true));
@@ -441,7 +441,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_IZone); m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_IZone);
// Briefly wait for new values from the Talon. // Briefly wait for new values from the Talon.
Timer.delay(1); Timer.delay(0.001);
long fp = CanTalonJNI.new_intp(); long fp = CanTalonJNI.new_intp();
m_impl.GetIzone(m_profile, new SWIGTYPE_p_int(fp, true)); m_impl.GetIzone(m_profile, new SWIGTYPE_p_int(fp, true));
@@ -460,7 +460,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_CloseLoopRampRate); m_impl.RequestParam(CanTalonSRX.param_t.eProfileParamSlot1_CloseLoopRampRate);
// Briefly wait for new values from the Talon. // Briefly wait for new values from the Talon.
Timer.delay(1); Timer.delay(0.001);
long fp = CanTalonJNI.new_intp(); long fp = CanTalonJNI.new_intp();
m_impl.GetCloseLoopRampRate(m_profile, new SWIGTYPE_p_int(fp, true)); m_impl.GetCloseLoopRampRate(m_profile, new SWIGTYPE_p_int(fp, true));