- 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:
11
interface.c
11
interface.c
@@ -226,6 +226,12 @@ static int DriveTaskFunc(void *data)
|
||||
if(status == HWBusy){
|
||||
return 1;
|
||||
}
|
||||
if(status == HWFault){
|
||||
taskData->pDriv->iErrorCount++;
|
||||
}
|
||||
if(status == HWFault || status == HWPosFault){
|
||||
SetDevexecStatus(pServ->pExecutor,DEVERROR);
|
||||
}
|
||||
DevexecLog("STOP",taskData->name);
|
||||
if(status == HWIdle || status == OKOK){
|
||||
ExeInterest(pServ->pExecutor,taskData->name, "finished");
|
||||
@@ -370,6 +376,10 @@ static int CountTaskFunc(void *data)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if(status == HWFault){
|
||||
SetDevexecStatus(pServ->pExecutor,DEVERROR);
|
||||
}
|
||||
|
||||
DevexecLog("STOP",taskData->name);
|
||||
if(status == HWIdle || status == OKOK){
|
||||
ExeInterest(pServ->pExecutor,taskData->name, "finished");
|
||||
@@ -396,6 +406,7 @@ long StartCountTask(void *obj, SConnection *pCon, char *name)
|
||||
return -1;
|
||||
}
|
||||
if(pCount->StartCount(obj,pCon) != OKOK){
|
||||
pCount->running = 0;
|
||||
return -1;
|
||||
}
|
||||
ExeInterest(pServ->pExecutor,name,"started");
|
||||
|
||||
Reference in New Issue
Block a user