- Introduced a state filed into first generation objects
- Fixed some issues with error returns not being properly handled in devexec - Fixed a bug in motorlist which caused limit checks to fail - Fixed an issue with the TDCHM not properly updating the counter values on finish - Readded getHipadabaPar in ChainCallback as this caused a problem in ei - Made tasdrive ignore sgu, sgl when out of plane not allowed SKIPPED: psi/eigermono.c psi/sinqhttp.c psi/tdchm.c
This commit is contained in:
9
motor.c
9
motor.c
@ -534,7 +534,7 @@ static int MotorGetParImpl(pMotor self, char *name, float *fVal)
|
||||
*fVal = self->pDriver->fLower;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
pPar = ObParFind(self->ParArray, name);
|
||||
if (pPar) {
|
||||
*fVal = pPar->fVal;
|
||||
@ -1364,6 +1364,13 @@ int MotorAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
SCWrite(pCon, pBueffel, eValue);
|
||||
DeleteTokenList(pList);
|
||||
return 1;
|
||||
} else if(strcmp(pName->text,"status") == 0){
|
||||
if(self->running){
|
||||
SCPrintf(pCon,eValue,"%s.status = run",argv[0]);
|
||||
} else {
|
||||
SCPrintf(pCon,eValue,"%s.status = idle",argv[0]);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
iRet = MotorGetPar(self, pName->text, &fValue);
|
||||
if (!iRet) {
|
||||
|
Reference in New Issue
Block a user