- Adapted indenation to new agreed upon system
- Fixed bad status in poldi zug driver
This commit is contained in:
16
lscsupport.c
16
lscsupport.c
@ -19,12 +19,14 @@ is not changed, i.e. an existing errCode is not overwritten.
|
||||
#include "oxinst.h"
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
int LscHandler(void *object) {
|
||||
int LscHandler(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);
|
||||
@ -37,17 +39,17 @@ int LscHandler(void *object) {
|
||||
}
|
||||
if (iret == 1) {
|
||||
ParPrintf(eab, -2, "ans: %s", eab->ans);
|
||||
if (strncmp(eab->ans, "0,123",5) == 0 && eab->state == EASE_lost) { /* response to LOCK? */
|
||||
if (strncmp(eab->ans, "0,123", 5) == 0 && eab->state == EASE_lost) { /* response to LOCK? */
|
||||
EaseWrite(eab, "*IDN?");
|
||||
goto quit;
|
||||
} else if (eab->state == EASE_lost) {
|
||||
goto quit;
|
||||
} else if (strncmp(eab->cmd,"*IDN?",5) == 0) {
|
||||
} else if (strncmp(eab->cmd, "*IDN?", 5) == 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;
|
||||
|
Reference in New Issue
Block a user