fix missing return, change SerialError to getRS232Error
r2416 | dcl | 2008-04-14 08:39:00 +1000 (Mon, 14 Apr 2008) | 2 lines
This commit is contained in:
@@ -38,6 +38,7 @@
|
||||
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
|
||||
MODIFICATIONS.
|
||||
----------------------------------------------------------------------------*/
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@@ -219,7 +220,7 @@
|
||||
/* Check that the controller is a gen-new-wine Lakeshore 340 */
|
||||
/* There's also the *REV command to check the firmware revision, but */
|
||||
/* that would be going too far ;) */
|
||||
sprintf(pCommand,"*IDN?",command);
|
||||
sprintf(pCommand,"*IDN?");
|
||||
usleep(100000); // Required to meet Lakeshore340 spec.
|
||||
if ((iRet=transactRS232(self->controller,pCommand,strlen(pCommand),pReply,79))<=0)
|
||||
return iRet;
|
||||
@@ -312,6 +313,8 @@
|
||||
|
||||
if(!self->iReadOnly)
|
||||
return LAKESHORE340_Setup(self, self->iControl);
|
||||
|
||||
return 1;
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
void LAKESHORE340_Close(pLAKESHORE340 *pData)
|
||||
@@ -526,7 +529,7 @@
|
||||
strncpy(pError,pBueffel,iLen);
|
||||
break;
|
||||
default:
|
||||
SerialError(iCode, pError,iLen);
|
||||
getRS232Error(iCode, pError,iLen);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user