- Added scaling to sicsdata
- Fixed fixed motor driving in tasdrive - Fixed stdscan to behnave nicely when various things are missing - Fixed a bug in multicounter
This commit is contained in:
5
motor.c
5
motor.c
@ -255,6 +255,8 @@ static void finishDriving(pMotor self, SConnection *pCon)
|
||||
MotCallback sCall;
|
||||
MotorGetSoftPosition(self,pCon,&sCall.fVal);
|
||||
sCall.pName = self->name;
|
||||
self->fPosition = sCall.fVal;
|
||||
self->fPosition = sCall.fVal;
|
||||
InvokeCallBack(self->pCall, MOTDRIVE, &sCall); /* send also very last position */
|
||||
InvokeCallBack(self->pCall, MOTEND, &sCall);
|
||||
}
|
||||
@ -329,7 +331,7 @@ static int evaluateStatus(pMotor self, SConnection *pCon)
|
||||
newStatus = checkPosition(self,pCon);
|
||||
if(newStatus != HWBusy)
|
||||
{
|
||||
finishDriving(self,pCon);
|
||||
finishDriving(self,pCon);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -350,6 +352,7 @@ static int evaluateStatus(pMotor self, SConnection *pCon)
|
||||
}
|
||||
if(newStatus == HWFault)
|
||||
{
|
||||
finishDriving(self,pCon);
|
||||
MotorInterrupt(pCon,ObVal(self->ParArray,INT));
|
||||
self->retryCount = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user