PSI UPDATE
r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines
This commit is contained in:
11
motor.c
11
motor.c
@@ -171,8 +171,10 @@
|
||||
fputs(pBueffel,fd);
|
||||
sprintf(pBueffel,"%s AccessCode %f\n",name,ObVal(self->ParArray,USRIGHTS));
|
||||
fputs(pBueffel,fd);
|
||||
sprintf(pBueffel,"%s poscount %f\n",name,
|
||||
ObVal(self->ParArray,POSCOUNT));
|
||||
sprintf(pBueffel,"%s failafter %f\n",name,ObVal(self->ParArray,ECOUNT));
|
||||
fputs(pBueffel,fd);
|
||||
sprintf(pBueffel,"%s maxretry %f\n",name,ObVal(self->ParArray,POSCOUNT));
|
||||
fputs(pBueffel,fd);
|
||||
sprintf(pBueffel,"%s movecount %f\n",name,
|
||||
ObVal(self->ParArray,MOVECOUNT));
|
||||
fputs(pBueffel,fd);
|
||||
@@ -256,6 +258,8 @@ 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);
|
||||
}
|
||||
@@ -330,7 +334,7 @@ static int evaluateStatus(pMotor self, SConnection *pCon)
|
||||
newStatus = checkPosition(self,pCon);
|
||||
if(newStatus != HWBusy)
|
||||
{
|
||||
finishDriving(self,pCon);
|
||||
finishDriving(self,pCon);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -351,6 +355,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