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

improved tecs driver M.Z.

Browse Source 
SKIPPED:
	psi/makefile
	psi/psi.c
	psi/tecsdriv.c
	psi/tecsdriv.h
	psi/hardsup/makefile
	psi/tecs/coc_client.c
	psi/tecs/coc_util.c
	psi/tecs/coc_util.h
	psi/tecs/didi
	psi/tecs/instr_hosts.c
	psi/tecs/make_gen
	psi/tecs/makefile
	psi/tecs/makefile_linux
	psi/tecs/myc_time.h
	psi/tecs/six.c
	psi/tecs/tecs.c
	psi/tecs/tecs_cli.c
	psi/tecs/tecs_client.f
	psi/tecs/tecs_data.c
	psi/tecs/tecs_plot.f
	psi/tecs/tecs_serial.c
	psi/tecs/term.c
	psi/utils/makefile
This commit is contained in:
cvs
2004-03-09 15:17:56 +00:00
parent f109d9a8c9
commit 137f5d2df1
11 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
evcontroller.c
View File

@ -244,7 +244,7 @@
}
now = time(NULL);
tmo = (int)(ObVal(self->pParam, MAXWAIT) * 60);
tmo = (int)(ObVal(self->pParam, MAXWAIT));
/* based on this: logic ! */
if (tmo>0 && now > self->start+tmo ) /* time out */
{
@ -261,14 +261,14 @@
iCount++;
return HWBusy;
}
tmo = (int)(ObVal(self->pParam, SETTLE) * 60);
tmo = (int)(ObVal(self->pParam, SETTLE));
if (self->lastt <= 0) /* lastt negative: -seconds already waited */
{
self->lastt += now;
if (tmo>0)
{
sprintf(pBueffel,"%s inside tolerance, wait %.2f min. to settle",
self->pName, (self->lastt + tmo - now)/60.0);
sprintf(pBueffel,"%s inside tolerance, wait %.2f sec. to settle",
self->pName, (self->lastt + tmo - now)*1.0);
SCWrite(pCon,pBueffel,eStatus);
}
return HWBusy;
@ -973,10 +973,10 @@ static void ErrReport(pEVControl self)
snprintf(pBueffel,255,"%s.%s = %g",self->pName, "SafeValue",
ObVal(self->pParam,SAFEVALUE));
SCWrite(pCon,pBueffel, eValue);
snprintf(pBueffel,255,"%s.%s = %g",self->pName, "MaxWait",
snprintf(pBueffel,255,"%s.%s = %g (sec)",self->pName, "MaxWait",
ObVal(self->pParam,MAXWAIT));
SCWrite(pCon,pBueffel, eValue);
snprintf(pBueffel,255,"%s.%s = %g",self->pName, "Settle",
snprintf(pBueffel,255,"%s.%s = %g (sec)",self->pName, "Settle",
ObVal(self->pParam,SETTLE));
SCWrite(pCon,pBueffel, eValue);
EVCGetPos(self,pCon,&fPos);