- Improvements to the chooper driver for the SANS2 chopper

- Fixes to the new counter and motor drivers
- Updated Linux makefiles to linux_def


SKIPPED:
	psi/dornier2.c
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/makefile_linux
	psi/psi.c
	psi/hardsup/makefile_linux
	psi/tecs/makefile_linux
This commit is contained in:
cvs
2003-07-14 11:56:54 +00:00
parent f7abbe6aa5
commit 3ddb19d8a9
12 changed files with 42 additions and 29 deletions

6
scan.c
View File

@ -557,6 +557,7 @@ extern void SNXFormatTime(char *pBuffer, int iLen);
self->ScanDrive = ScanDrive;
self->ScanCount = ScanCount;
self->CollectScanData = CollectScanData;
self->posSoft = 0;
strcpy(self->ext,".dat");
return 1;
@ -1715,6 +1716,10 @@ int StoreScanCounts(pScanData self, char *data)
return 0;
}
}
/*---------------------------------------------------------------------*/
int isScanVarSoft(pScanData self){
return self->posSoft;
}
/*-------------------------------------------------------------------------*/
int GetScanVarStep(pScanData self, int iWhich, float *fStep)
{
@ -2330,6 +2335,7 @@ int StoreScanCounts(pScanData self, char *data)
{
ResetScanFunctions(self);
self->CollectScanData = CollectScanDataJochen;
self->posSoft = 1;
SCSendOK(pCon);
return 1;
}