- Fixed a bug in countersec.c which prevented counting in monitor mode

- Fixes to make the second generation velocity selector driver work
- Modified obpar.c to allow parameter changes while running. This makes
  it possible to collect data at TRICS while cooling down.
This commit is contained in:
koennecke
2009-05-26 09:36:59 +00:00
parent 01c3be2bc3
commit 85880be565
9 changed files with 24 additions and 20 deletions

View File

@ -42,8 +42,9 @@ static hdbCallbackReturn tiltCallback(pHdb node, void *userData,
val = tilt->pDrivInt->GetValue(tilt,pServ->dummyCon);
}
node->value.v.doubleValue = val;
return hdbContinue;
}
if((set = GetHdbGetMessage(message)) != NULL){
if((set = GetHdbSetMessage(message)) != NULL){
if(set->callData != NULL){
pCon = (SConnection *)set->callData;
} else {
@ -98,7 +99,7 @@ int MakeSecNVS(SConnection * pCon, SicsInterp * pSics,
{
pMotor tilt = NULL;
pSICSOBJ pNew = NULL;
SctController *sct = NULL;
pSICSOBJ sct = NULL;
pHdb node = NULL, tilli;
int status;
@ -115,7 +116,7 @@ int MakeSecNVS(SConnection * pCon, SicsInterp * pSics,
return 0;
}
sct = (SctController *)FindCommandData(pSics, argv[3],"ScriptContext");
sct = (pSICSOBJ)FindCommandData(pSics, argv[3],"SctController");
if(sct == NULL){
SCPrintf(pCon,eError, "ERROR: scriptcontext %s not found", argv[3]);
return 0;
@ -125,7 +126,7 @@ int MakeSecNVS(SConnection * pCon, SicsInterp * pSics,
SetHdbProperty(node,"sicsdev",argv[1]);
SetHdbProperty(node,"priv", "user");
pNew = MakeSctDriveObj(node, "NVS", sct, 0);
pNew = MakeSctDriveObj(node, "NVS", sct->pPrivate, 0);
if(pNew == NULL || node == NULL){
SCWrite(pCon,"ERROR: failed to create NVS, out of memory?",
eError);