- Adapted indenation to new agreed upon system

- Fixed bad status in poldi zug driver
This commit is contained in:
koennecke
2009-02-13 09:01:03 +00:00
parent 6c7bb14fad
commit eb72d5c486
151 changed files with 38234 additions and 38208 deletions

195
ilmdriv.c
View File

@ -30,7 +30,8 @@ Markus Zolliker, April 2005
/*
typedef enum { ALWAYSNEW, NEW, MEASURING, NOTYETREAD, OLD } ReadState;
*/
typedef enum { UNUSED, N2, PULSED_HE, CONTINOUS_HE, CHANNEL_ERROR = 9 } Usage;
typedef enum { UNUSED, N2, PULSED_HE, CONTINOUS_HE, CHANNEL_ERROR =
9 } Usage;
typedef struct {
EaseBase b;
@ -43,29 +44,34 @@ typedef struct {
static ParClass ilmClass = { "ILM", sizeof(Ilm) };
char *tails[10]={"unused", "% N2", "% He","% He","","","","","","error"};
char *tails[10] =
{ "unused", "% N2", "% He", "% He", "", "", "", "", "", "error" };
/*----------------------------------------------------------------------------*/
static void IlmParDef(void *object) {
static void IlmParDef(void *object)
{
Ilm *drv = ParCast(&ilmClass, object);
ParName("");
if (drv->usage[0]) {
ParFmt("%.1f"); ParTail(tails[drv->usage[0]]);
ParFmt("%.1f");
ParTail(tails[drv->usage[0]]);
}
/* if (drv->readState[0] == NEW) ParLogReady(PAR_NOW_READY); */
ParFloat(&drv->lev[0], PAR_NAN);
ParName("lev2");
if (drv->usage[1]) {
ParFmt("%.1f"); ParTail(tails[drv->usage[1]]);
ParFmt("%.1f");
ParTail(tails[drv->usage[1]]);
};
/* if (drv->readState[1] == NEW) ParLogReady(PAR_NOW_READY); */
ParFloat(&drv->lev[1], PAR_NAN);
ParName("lev3");
if (drv->usage[2]) {
ParFmt("%.1f"); ParTail(tails[drv->usage[2]]);
ParFmt("%.1f");
ParTail(tails[drv->usage[2]]);
}
/* if (drv->readState[2] == NEW) ParLogReady(PAR_NOW_READY); */
ParFloat(&drv->lev[2], PAR_NAN);
@ -74,137 +80,162 @@ static void IlmParDef(void *object) {
ParStdDef();
EaseMsgPar(drv);
}
/*----------------------------------------------------------------------------*/
static void IlmStatus(Ilm *drv) {
static void IlmStatus(Ilm * drv)
{
char *ans;
int *code;
int i;
int status;
if (drv->b.state != EASE_read) return;
ans=drv->b.ans;
code=&drv->b.errCode;
if (drv->b.state != EASE_read)
return;
ans = drv->b.ans;
code = &drv->b.errCode;
if (ans[0] != 'X' || ans[4] != 'S' || ans[11] != 'R') {
ParPrintf(drv, eError, "illegal status response");
*code = EASE_FAULT;
return;
}
for (i=0; i<3; i++) {
if (ans[i+1]<'0' || ans[i+1] > '9') {
ans[i+1]='9';
for (i = 0; i < 3; i++) {
if (ans[i + 1] < '0' || ans[i + 1] > '9') {
ans[i + 1] = '9';
}
drv->usage[i] = ans[i+1] - '0';
drv->usage[i] = ans[i + 1] - '0';
if (drv->usage[i] == PULSED_HE) {
/*
sscanf(ans+6+2*i, "%1x", &status);
if (status & 1) { // measuring
drv->readState[i] = MEASURING;
} else if (drv->readState[i] == MEASURING) { // new value
drv->readState[i] = NOTYETREAD;
}
*/
sscanf(ans+6+2*i, "%1x", &status);
if (status & 1) { // measuring
drv->readState[i] = MEASURING;
} else if (drv->readState[i] == MEASURING) { // new value
drv->readState[i] = NOTYETREAD;
}
*/
} else {
/*
drv->readState[i] = ALWAYSNEW;
*/
drv->readState[i] = ALWAYSNEW;
*/
}
}
return;
}
/*----------------------------------------------------------------------------*/
static long IlmRead(long pc, void *object) {
static long IlmRead(long pc, void *object)
{
Ilm *drv = ParCast(&ilmClass, object);
EaseBase *eab = object;
int i;
switch (pc) { default: /* FSM BEGIN *******************************/
EaseWrite(eab, "X");
return __LINE__; case __LINE__: /**********************************/
IlmStatus(drv); /* check for errors */
EaseWrite(eab, "R1"); /* read sensor 1 */
return __LINE__; case __LINE__: /**********************************/
/* if (drv->readState[0] != MEASURING) */
drv->lev[0] = OxiGet(eab, 1, NULL, drv->lev[0]);
/*
if (drv->readState[0] == NOTYETREAD) {
drv->readState[0] = NEW;
}
*/
if (drv->usage[1] == 0) goto skip2;
EaseWrite(eab, "R2"); /* read sensor 2 */
return __LINE__; case __LINE__: /**********************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
EaseWrite(eab, "X");
return __LINE__;
case __LINE__: /**********************************/
IlmStatus(drv); /* check for errors */
EaseWrite(eab, "R1"); /* read sensor 1 */
return __LINE__;
case __LINE__: /**********************************/
/* if (drv->readState[0] != MEASURING) */
drv->lev[0] = OxiGet(eab, 1, NULL, drv->lev[0]);
/*
if (drv->readState[0] == NOTYETREAD) {
drv->readState[0] = NEW;
}
*/
if (drv->usage[1] == 0)
goto skip2;
EaseWrite(eab, "R2"); /* read sensor 2 */
return __LINE__;
case __LINE__: /**********************************/
drv->lev[1] = OxiGet(eab, 1, NULL, drv->lev[1]);
/*
if (drv->readState[1] == NOTYETREAD) {
drv->readState[1] = NEW;
}
*/
if (drv->readState[1] == NOTYETREAD) {
drv->readState[1] = NEW;
}
*/
skip2:
if (drv->usage[2] == 0) goto skip3;
EaseWrite(eab, "R3"); /* read sensor 3 */
return __LINE__; case __LINE__: /**********************************/
if (drv->usage[2] == 0)
goto skip3;
EaseWrite(eab, "R3"); /* read sensor 3 */
return __LINE__;
case __LINE__: /**********************************/
drv->lev[2] = OxiGet(eab, 1, NULL, drv->lev[2]);
/*
if (drv->readState[2] == NOTYETREAD) {
drv->readState[2] = NEW;
}
*/
if (drv->readState[2] == NOTYETREAD) {
drv->readState[2] = NEW;
}
*/
skip3:
if (ParLog(drv) >= 0) { /* logging was done */
if (ParLog(drv) >= 0) { /* logging was done */
/*
for (i=0; i<3; i++) {
if (drv->readState[i] == NEW) {
drv->readState[i] = OLD;
}
}
*/
for (i=0; i<3; i++) {
if (drv->readState[i] == NEW) {
drv->readState[i] = OLD;
}
}
*/
}
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static long IlmStart(long pc, void *object) {
static long IlmStart(long pc, void *object)
{
Ilm *drv = ParCast(&ilmClass, object);
EaseBase *eab = object;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
EaseWrite(eab, "V");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
if (0 != strncmp(eab->version, "ILM", 3)) {
snprintf(eab->msg, sizeof eab->msg, "unknown level meter version: %s", eab->version);
snprintf(eab->msg, sizeof eab->msg,
"unknown level meter version: %s", eab->version);
ParPrintf(drv, eError, "ERROR: %s", eab->msg);
EaseStop(eab);
goto quit;
}
ParPrintf(drv, eLog, "connected to %s", eab->version);
eab->msg[0]='\0'; /* o.k. */
eab->msg[0] = '\0'; /* o.k. */
FsmCall(IlmRead);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
quit:
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static int IlmInit(SConnection *con, int argc, char *argv[], int dynamic) {
static int IlmInit(SConnection * con, int argc, char *argv[], int dynamic)
{
/* args:
MakeObject objectname ilm <rs232>
<host> <port>
MakeObject objectname ilm <rs232>
<host> <port>
*/
Ilm *drv;
drv = EaseMakeBase(con, &ilmClass, argc, argv, dynamic, 0,
IlmParDef, OxiHandler, IlmStart, NULL, IlmRead);
if (drv == NULL) return 0;
IlmParDef, OxiHandler, IlmStart, NULL, IlmRead);
if (drv == NULL)
return 0;
return 1;
}
/*----------------------------------------------------------------------------*/
void IlmStartup(void) {
void IlmStartup(void)
{
ParMakeClass(&ilmClass, EaseBaseClass());
MakeDriver("ILM", IlmInit, 0, "OI Level Meter");
MakeDriver("ILM", IlmInit, 0, "OI Level Meter");
}