- Added some hipadab array math

- Added missing cnvrt files, stolen from Markus
- Debugged the new sinqhttpopt driver for SINQ HTTP HM
- Debugged the driver for the new S7 Siemens SPS
- Added handling of hexadecimal terminators to ascon.c
- Increased the write buffer size in asynnet again
- Fixed  a core dump in lld.c
- Added writing of second gen HM to nxscript.c
- Added doubletime command to SICS
- Fixed a core dump issue in sicshdbadapter.c on dimension changes
- Modified sicsobj to look for lower case keys too
This commit is contained in:
koennecke
2011-04-08 14:18:43 +00:00
parent 1384d9034a
commit 3eed3432cb
8 changed files with 210 additions and 21 deletions

View File

@ -85,6 +85,7 @@ static int transactEL734(prs232 self, void *send, int sendLen,
{
int status, len, oldTimeout;
char *pReply = NULL;
char rubbish[2024];
/*
try to read away rubbish on the line first
@ -92,8 +93,8 @@ static int transactEL734(prs232 self, void *send, int sendLen,
oldTimeout = getRS232Timeout(self);
setRS232Timeout(self, 0);
if (availableRS232(self)) {
len = replylen;
readRS232(self, reply, &len);
len = sizeof(rubbish);
readRS232(self, rubbish, &len);
}
setRS232Timeout(self, oldTimeout);
@ -133,6 +134,7 @@ static void checkEmpty(pEL734Driv self, char *pReply, int *replylen)
{
int oldTimeout;
/*
if (strlen(pReply) < 1) {
oldTimeout = getRS232Timeout(self->controller);
setRS232Timeout(self->controller, 0);
@ -141,6 +143,12 @@ static void checkEmpty(pEL734Driv self, char *pReply, int *replylen)
}
setRS232Timeout(self->controller, oldTimeout);
}
*/
if (strlen(pReply) < 1) {
readRS232(self->controller, pReply, replylen);
/* printf("checkEmpty read %s\n", pReply); */
}
}
/*--------------------------------------------------------------------*/
@ -329,6 +337,7 @@ static int EL734Status(void *pData)
return HWFault;
}
replyLen = 79;
checkEmpty(self, pReply, &replyLen);
if (!checkResponse(self, pReply)) {