- 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

10
motor.c
View File

@ -992,7 +992,7 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
/* a first check */
if (argc < 3) {
SCWrite(pCon, "Insufficient arguments for motor creation", eError);
SCWrite(pCon, "Insufficient arguments for motor creation", eLogError);
return 0;
}
@ -1009,7 +1009,7 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
pNew = MotorInit("SIM", argv[1], pDriver);
if (!pNew) {
sprintf(pBueffel, "Failure to create motor %s", argv[1]);
SCWrite(pCon, pBueffel, eError);
SCWrite(pCon, pBueffel, eLogError);
return 0;
}
} else if (strcmp(argv[2], "tclmot") == 0) {
@ -1021,7 +1021,7 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
pNew = MotorInit("TCLMOT", argv[1], pDriver);
if (!pNew) {
sprintf(pBueffel, "Failure to create motor %s", argv[1]);
SCWrite(pCon, pBueffel, eError);
SCWrite(pCon, pBueffel, eLogError);
return 0;
}
} else if (strcmp(argv[2], "regress") == 0) {
@ -1033,7 +1033,7 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
pNew = MotorInit("regress", argv[1], pDriver);
if (!pNew) {
sprintf(pBueffel, "Failure to create motor %s", argv[1]);
SCWrite(pCon, pBueffel, eError);
SCWrite(pCon, pBueffel, eLogError);
return 0;
}
} else {
@ -1044,7 +1044,7 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
if (pNew == NULL) {
sprintf(pBueffel, "Motor Type %s not recognized for motor %s",
argv[2], argv[1]);
SCWrite(pCon, pBueffel, eError);
SCWrite(pCon, pBueffel, eLogError);
return 0;
}
}