- 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:
cvs
2004-11-17 10:50:15 +00:00
parent f7c8ae30c6
commit 0f4e959e22
46 changed files with 3675 additions and 834 deletions

View File

@ -472,7 +472,7 @@ int NETReadTillTermNew(mkChannel *self, int timeout,
return -1;
}
maxTime = time(NULL) + (time_t)ceil((double)timeout/1000);
maxTime = time(NULL) + (time_t)ceil((double)timeout/1000 +1);
length = strlen(pTerm);
memset(pBuffer,0,iBufLen);
@ -503,6 +503,8 @@ int NETReadTillTermNew(mkChannel *self, int timeout,
}
pBuffer[bufPtr] = c;
bufPtr++;
} else {
return -1;
}
/*
wait for more data