long scaling factor

pull/112/head
gabrielburnworth 2019-02-07 17:43:28 -08:00
parent 923b05ffd2
commit d9795623d4
3 changed files with 4 additions and 4 deletions

View File

@ -131,7 +131,7 @@ private:
float motorConsMissedStepsDecay[3] = { 0, 0, 0 };
bool motorConsEncoderEnabled[3] = { false, false, false };
int motorConsEncoderType[3] = { 0, 0, 0 };
int motorConsEncoderScaling[3] = { 0, 0, 0 };
long motorConsEncoderScaling[3] = { 0, 0, 0 };
int motorConsEncoderUseForPos[3] = { 0, 0, 0 };
int motorConsEncoderInvert[3] = { 0, 0, 0 };

View File

@ -53,7 +53,7 @@ void StepperControlEncoder::loadPinNumbers(int channelA, int channelB, int chann
shiftChannels();
}
void StepperControlEncoder::loadSettings(int encType, int scaling, int invert)
void StepperControlEncoder::loadSettings(int encType, long scaling, int invert)
{
encoderType = encType;
scalingFactor = scaling;

View File

@ -24,7 +24,7 @@ public:
StepperControlEncoder();
void loadPinNumbers(int channelA, int channelB, int channelAQ, int channelBQ);
void loadSettings(int encType, int scaling, int invert);
void loadSettings(int encType, long scaling, int invert);
// Load the id for the motor dynamics lab encoder
void loadMdlEncoderId(MdlSpiEncoders encoder);
@ -60,7 +60,7 @@ private:
// encoder
long position;
int scalingFactor;
long scalingFactor;
int encoderType;
int encoderInvert;