linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Adapted indenation to new agreed upon system

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

31
oicom.c
View File

@@ -21,9 +21,10 @@ is not changed, i.e. an existing errCode is not overwritten.
/*----------------------------------------------------------------------------*/
int OiHandler(Eve *eve) {
int OiHandler(Eve * eve)
{
int iret, l;
if (availableNetRS232(eve->ser)) {
l = sizeof(eve->ans);
iret = readRS232TillTerm(eve->ser, eve->ans, &l);
@@ -46,15 +47,15 @@ int OiHandler(Eve *eve) {
if (strcmp(eve->ans, eve->version) == 0) {
/* we are still connected with the same device */
} else if (*eve->version == '\0') {
strncat(eve->version, eve->ans, sizeof(eve->version)-1);
} else { /* version (and therefore device) changed */
strncat(eve->version, eve->ans, sizeof(eve->version) - 1);
} else { /* version (and therefore device) changed */
eve->errCode = EVE_DEV_CHANGED;
eve->state = idleState;
goto error;
}
eve->state = idleState;
goto quit;
} else if (eve->cmd[1] == 'k') { /* ck */
} else if (eve->cmd[1] == 'k') { /* ck */
} else if (eve->cmd[0] != eve->ans[0]) {
iret = EVE_ILL_ANS;
}
@@ -66,7 +67,7 @@ int OiHandler(Eve *eve) {
}
eve->state = readState;
} else if (eve->state == expectState) {
if (time(NULL) > eve->cmdtime+60) {
if (time(NULL) > eve->cmdtime + 60) {
eve->errCode = TIMEOUT;
eve->state = lostState;
}
@@ -83,10 +84,11 @@ quit:
return EveHandler(eve);
}
double OiGetFlt(Eve *eve, int dig, int *pdig) {
double OiGetFlt(Eve * eve, int dig, int *pdig)
{
char *endp, *p;
double val;
if (eve->state != readState) {
/* eve->errCode = EVE_ILL_ANS; */
return 0.0;
@@ -96,25 +98,27 @@ double OiGetFlt(Eve *eve, int dig, int *pdig) {
if (pdig != NULL) {
*pdig = strlen(eve->ans) - (p - eve->ans) - 1;
}
val=strtod(eve->ans+1, &endp);
val = strtod(eve->ans + 1, &endp);
if (*endp != '\0') {
eve->errCode = EVE_ILL_ANS;
return 0.0;
}
} else {
val=strtol(eve->ans+1, &endp, 10);
val = strtol(eve->ans + 1, &endp, 10);
if (*endp != '\0') {
eve->errCode = EVE_ILL_ANS;
return 0.0;
}
if (eve->syntax == 0) { /* old style format */
for (; dig > 0; dig--) val=val*0.1;
if (eve->syntax == 0) { /* old style format */
for (; dig > 0; dig--)
val = val * 0.1;
}
}
return val;
}
void OiSet(Eve *eve, char *cmd, double val, int dig) {
void OiSet(Eve * eve, char *cmd, double val, int dig)
{
char buf[64];
long lval;
@@ -125,4 +129,3 @@ void OiSet(Eve *eve, char *cmd, double val, int dig) {
}
EveWrite(eve, buf);
}