- Added a SICS to Hipadaba adapter
- Added a separate polling module to SICS
This commit is contained in:
13
motor.c
13
motor.c
@ -76,13 +76,6 @@
|
||||
#define IGNOREFAULT 10
|
||||
#define MOVECOUNT 11
|
||||
|
||||
/*------------------------------------------------------------------------
|
||||
a tiny structure used in CallBack work
|
||||
*/
|
||||
typedef struct {
|
||||
float fVal;
|
||||
char *pName;
|
||||
} MotCallback;
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
static void *MotorGetInterface(void *pData, int iID)
|
||||
@ -416,7 +409,7 @@ static void handleMoveCallback(pMotor self, SConnection *pCon)
|
||||
|
||||
|
||||
/* create and initialize parameters */
|
||||
pM->ParArray = ObParCreate(12);
|
||||
pM->ParArray = ObParCreate(MOTOBPARLENGTH);
|
||||
if(!pM->ParArray)
|
||||
{
|
||||
free(pM);
|
||||
@ -606,6 +599,7 @@ extern void KillPiPiezo(void *pData);
|
||||
if(iRet == 1)
|
||||
{
|
||||
SCparChange(pCon);
|
||||
InvokeCallBack(self->pCall,HDBVAL,self);
|
||||
return iRet;
|
||||
}
|
||||
}
|
||||
@ -631,6 +625,7 @@ extern void KillPiPiezo(void *pData);
|
||||
fLimit -= fChange;
|
||||
ObParSet(self->ParArray,self->name,"softlowerlim",fLimit,pCon);
|
||||
SCparChange(pCon);
|
||||
InvokeCallBack(self->pCall,HDBVAL,self);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -652,6 +647,7 @@ extern void KillPiPiezo(void *pData);
|
||||
ObParInit(self->ParArray,SZERO,"softzero",ZEROINACTIVE,usUser);
|
||||
}
|
||||
}
|
||||
InvokeCallBack(self->pCall,HDBVAL,self);
|
||||
SCparChange(pCon);
|
||||
|
||||
return iRet;
|
||||
@ -785,6 +781,7 @@ extern void KillPiPiezo(void *pData);
|
||||
self->retryCount = 0;
|
||||
self->stopped = 0;
|
||||
self->fTarget = fHard;
|
||||
InvokeCallBack(self->pCall,HDBVAL,self);
|
||||
self->posCount = 0;
|
||||
iRet = self->pDriver->RunTo(self->pDriver,fHard);
|
||||
if(iRet != OKOK)
|
||||
|
Reference in New Issue
Block a user