- 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

View File

@@ -38,12 +38,14 @@ typedef struct {
static ParClass linaClass = { "LINA", sizeof(Lina) };
/*----------------------------------------------------------------------------*/
int LinaHandler(void *object) {
int LinaHandler(void *object)
{
int iret, l;
EaseBase *eab = EaseBaseCast(object);
char *corr;
if (eab->state < EASE_idle) goto quit;
if (eab->state < EASE_idle)
goto quit;
if (availableNetRS232(eab->ser) || availableRS232(eab->ser)) {
eab->msg[0] = '\0';
l = sizeof(eab->ans);
@@ -58,12 +60,12 @@ int LinaHandler(void *object) {
ParPrintf(eab, -2, "ans: %s", eab->ans);
if (eab->state == EASE_lost) {
goto quit;
} else if (strncmp(eab->cmd,"ID",2) == 0) {
} else if (strncmp(eab->cmd, "ID", 2) == 0) {
if (strcmp(eab->ans, eab->version) == 0) {
/* we are still connected with the same device */
} else if (*eab->version == '\0') {
strncat(eab->version, eab->ans, sizeof(eab->version)-1);
} else { /* version (and therefore device) changed */
strncat(eab->version, eab->ans, sizeof(eab->version) - 1);
} else { /* version (and therefore device) changed */
eab->errCode = EASE_DEV_CHANGED;
eab->state = EASE_idle;
goto error;
@@ -98,18 +100,23 @@ error:
quit:
return EaseHandler(eab);
}
/*----------------------------------------------------------------------------*/
static void LinaParDef(void *object) {
static void LinaParDef(void *object)
{
Lina *drv = ParCast(&linaClass, object);
EaseBase *eab = object;
ParName(""); ParTail("units");
ParName("");
ParTail("units");
ParFloat(&drv->x, PAR_NAN);
ParName("x"); ParTail("");
ParName("x");
ParTail("");
ParFloat(&drv->x, PAR_NAN);
ParName("y"); ParTail("");
ParName("y");
ParTail("");
ParFloat(&drv->y, PAR_NAN);
EaseBasePar(drv);
@@ -120,82 +127,103 @@ static void LinaParDef(void *object) {
ParStdDef();
EaseMsgPar(drv);
}
/*----------------------------------------------------------------------------*/
static long LinaRead(long pc, void *object) {
static long LinaRead(long pc, void *object)
{
Lina *drv = ParCast(&linaClass, object);
EaseBase *eab = object;
char *p;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
EaseWrite(eab, "XY.");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
p = strchr(eab->ans, ',');
if (p) {
*p='\0';
*p = '\0';
p++;
drv->x = atof(eab->ans);
drv->y = atof(p);
}
ParLog(drv);
fsm_quit: return 0; } /* FSM END *********************************/
fsm_quit:return 0;
} /* FSM END ******************************** */
}
/*----------------------------------------------------------------------------*/
static long LinaStart(long pc, void *object) {
static long LinaStart(long pc, void *object)
{
Lina *drv = ParCast(&linaClass, object);
EaseBase *eab = object;
switch (pc) { default: /* FSM BEGIN *******************************/
switch (pc) {
default: /* FSM BEGIN ****************************** */
EaseWrite(eab, "ID");
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
if (0 != strncmp(eab->version, "7265", 4)) {
snprintf(eab->msg, sizeof eab->msg, "unknown lock in amplifier version: %s",
eab->version);
snprintf(eab->msg, sizeof eab->msg,
"unknown lock in amplifier version: %s", eab->version);
ParPrintf(drv, eError, "ERROR: %s", eab->msg);
EaseStop(eab);
goto quit;
}
ParPrintf(drv, eLog, "connected to %s", eab->version);
FsmCall(LinaRead);
return __LINE__; case __LINE__: /**********************************/
return __LINE__;
case __LINE__: /**********************************/
quit:
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static long LinaSet(long pc, void *object) {
static long LinaSet(long pc, void *object)
{
Lina *drv = ParCast(&linaClass, object);
EaseBase *eab = object;
char cmd[32];
int upd;
switch (pc) { default: /* FSM BEGIN *******************************/
/*
snprintf(cmd, sizeof cmd, "SETP %.5g;SETP?", drv->d.targetValue);
EaseWrite(eab, cmd);
*/
switch (pc) {
default: /* FSM BEGIN ****************************** */
/*
snprintf(cmd, sizeof cmd, "SETP %.5g;SETP?", drv->d.targetValue);
EaseWrite(eab, cmd);
*/
quit:
return 0; } /* FSM END ********************************************/
return 0;
} /* FSM END ******************************************* */
}
/*----------------------------------------------------------------------------*/
static int LinaInit(SConnection *con, int argc, char *argv[], int dynamic) {
static int LinaInit(SConnection * con, int argc, char *argv[], int dynamic)
{
/* args:
MakeObject objectname lina <rs232>
MakeObject objectname lina <host> <port>
MakeObject objectname lina <rs232>
MakeObject objectname lina <host> <port>
*/
Lina *drv;
drv = EaseMakeDriv(con, &linaClass, argc, argv, dynamic, 7,
LinaParDef, LinaHandler, LinaStart, NULL, LinaRead,
LinaSet);
if (drv == NULL) return 0;
LinaParDef, LinaHandler, LinaStart, NULL, LinaRead,
LinaSet);
if (drv == NULL)
return 0;
/*
setRS232ReplyTerminator(drv->d.b.ser,"\n");
setRS232SendTerminator(drv->d.b.ser,"\n");
*/
return 1;
}
/*----------------------------------------------------------------------------*/
void LinaStartup(void) {
void LinaStartup(void)
{
ParMakeClass(&linaClass, EaseDrivClass());
MakeDriver("LINA", LinaInit, 0, "Lock in amplifier SIGNAL RECOVERY Model 7265");
MakeDriver("LINA", LinaInit, 0,
"Lock in amplifier SIGNAL RECOVERY Model 7265");
}