- Cleaned all old dtatus setting code
This commit is contained in:
@ -318,20 +318,16 @@ static int isMultiMasterRunning(pCounter self, SConnection *pCon, int *status)
|
||||
UpdateHipadabaPar(stopTime,MakeHdbInt(time(NULL)),pCon);
|
||||
SecCounterSetError(self,"Master counter errror");
|
||||
*status = HWBusy;
|
||||
ClearFixedStatus(eCounting);
|
||||
break;
|
||||
case HWPause:
|
||||
UpdateHipadabaPar(myStatus,MakeHdbText("paused"),pCon);
|
||||
*status = HWPause;
|
||||
SetStatusFixed(ePaused);
|
||||
break;
|
||||
case HWNoBeam:
|
||||
UpdateHipadabaPar(myStatus,MakeHdbText("nobeam"),pCon);
|
||||
*status = HWNoBeam;
|
||||
SetStatusFixed(eOutOfBeam);
|
||||
break;
|
||||
default:
|
||||
SetStatusFixed(eCounting);
|
||||
*status = HWBusy;
|
||||
UpdateHipadabaPar(myStatus,MakeHdbText("run"),pCon);
|
||||
if (self->iCallbackCounter > 20) {
|
||||
@ -414,7 +410,6 @@ static void multiEndCounting(pCounter self, SConnection *pCon)
|
||||
InvokeCallBack(self->pCall, COUNTEND, NULL);
|
||||
ReleaseCountLock(self->pCountInt);
|
||||
MultiSecTransfer(self,pCon);
|
||||
ClearFixedStatus(eEager);
|
||||
|
||||
}
|
||||
/*-------------------------------------------------------------------------------------*/
|
||||
@ -432,7 +427,6 @@ static int MultiSecStatus(void *pData, SConnection * pCon)
|
||||
}
|
||||
|
||||
if(areSlavesRunning(self,pCon, &status)){
|
||||
SetStatusFixed(eCounting);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user