- New batch file management module
- New oscillator module - Bug fixes SKIPPED: psi/buffer.c psi/el734hp.c psi/el737hpdriv.c psi/make_gen psi/nextrics.c psi/nxamor.c psi/pimotor.c psi/polterwrite.c psi/psi.c psi/swmotor2.c psi/tasscan.c psi/tricssupport.c psi/tricssupport.h psi/tecs/make_gen psi/utils/ecb_load_new/ecb_load.c psi/utils/ecb_load_new/ecb_load.h psi/utils/ecb_load_new/ecbdriv_els.c psi/utils/ecb_load_new/gpib_els.c psi/utils/ecb_load_new/makefile psi/utils/ecb_load_new/makefile_EGPIB psi/utils/ecb_load_new/makefile_GPIB
This commit is contained in:
@ -228,6 +228,7 @@ int readRS232TillTerm(prs232 self, void *data, int *datalen){
|
||||
}
|
||||
else if(iRet == -1)
|
||||
{
|
||||
printf("Incomplete read: %s\n", (char *)data);
|
||||
return INCOMPLETE;
|
||||
}
|
||||
*datalen = strlen((char *)data);
|
||||
@ -592,7 +593,7 @@ int RS232Action(SConnection *pCon, SicsInterp *pSics,
|
||||
}
|
||||
else if(strcmp(argv[1],"timeout") == 0)
|
||||
{
|
||||
if(checkSet(pCon,argc,usMugger))
|
||||
if(checkSet(pCon,argc,usUser))
|
||||
{
|
||||
setRS232Timeout(self,atoi(argv[2]));
|
||||
SCSendOK(pCon);
|
||||
|
Reference in New Issue
Block a user