Some bug fixes:

- 0.0 rather then -777.77 for a missing value in four circle
- No error output in TAS
This commit is contained in:
2015-12-07 14:38:11 +01:00
parent 8394e52393
commit 0d58ba2ef7
4 changed files with 6 additions and 4 deletions

View File

@ -487,7 +487,7 @@ static int FourMessStoreIntern(pSICSOBJ self, SConnection * pCon,
} }
/* get mf */ /* get mf */
fMF = -777.77; fMF = -0.00;
pEva = (pEVControl) FindCommandData(pServ->pSics, "mf", pEva = (pEVControl) FindCommandData(pServ->pSics, "mf",
"Environment Controller"); "Environment Controller");
if (pEva == NULL) { if (pEva == NULL) {

View File

@ -260,7 +260,7 @@ long StartDriveTask(void *obj, SConnection *pCon, char *name, float fTarget)
return -1; return -1;
} }
if(pDriv->CheckLimits(obj,fTarget,error,sizeof(error)) != OKOK){ if(pDriv->CheckLimits(obj,fTarget,error,sizeof(error)) != OKOK){
SCPrintf(pCon,eError,"ERROR: %s cannot reach %f, reason %s", name, SCPrintf(pCon,eLogError,"ERROR: %s cannot reach %f, reason %s", name,
fTarget, error); fTarget, error);
return -1; return -1;
} }

View File

@ -64,7 +64,7 @@
int running; int running;
int (*Halt)(void *self); int (*Halt)(void *self);
void (*SetCountParameters)(void *self, float fPreset, void (*SetCountParameters)(void *self, float fPreset,
CounterMode eMode);\ CounterMode eMode);
int (*StartCount)(void *self, SConnection *pCon); int (*StartCount)(void *self, SConnection *pCon);
int (*CheckCountStatus)(void *self, SConnection *pCon); int (*CheckCountStatus)(void *self, SConnection *pCon);
int (*Pause)(void *self, SConnection *pCon); int (*Pause)(void *self, SConnection *pCon);

View File

@ -4238,7 +4238,9 @@ static hdbCallbackReturn SICSNotifyScriptCallback(pHdb node, void *userData,
return hdbContinue; return hdbContinue;
} }
copyHdbValue(mm->v, &node->value); if(mm->v != &node->value){
copyHdbValue(mm->v, &node->value);
}
status = Tcl_Eval(InterpGetTcl(pServ->pSics), script); status = Tcl_Eval(InterpGetTcl(pServ->pSics), script);
if (status != TCL_OK) { if (status != TCL_OK) {
tracePar(node->name,"ERROR: %s while evaluating updatescript %s", tracePar(node->name,"ERROR: %s while evaluating updatescript %s",