Merge "Single line bug in CanTalonSRX::GetAnalogInVel(). return value was not being sign-extended."

This commit is contained in:
Brad Miller (WPI)
2014-12-19 07:02:09 -08:00
committed by Gerrit Code Review

View File

@@ -876,9 +876,9 @@ CTR_Code CanTalonSRX::GetAnalogInVel(int &param)
raw |= rx->AnalogInVelH;
raw <<= 8;
raw |= rx->AnalogInVelL;
param = (int)raw;
raw <<= (32-16); /* sign extend */
raw >>= (32-16); /* sign extend */
param = (int)raw;
return rx.err;
}
CTR_Code CanTalonSRX::GetTemp(double &param)