- Fixed sicsprompt bug. Sicsprompt caused a core dump

- Removed generation of incommenurate reflections for 0,0,0 in fourmess.c
- Implemented a Poch command for heartbeats
- Fixed 64 bit dimension issues in nxdict
- Fixed different calling conventions for NXReportError deep stack in nxdict
- Stopped ei motor driving when not necessary
- Added yet another monitor for POLDI
- Added a protocoll driver for the JVL motor RS-485 binary protocoll
- Fixed some reporting issues


SKIPPED:
	psi/jvlprot.c
	psi/make_gen
	psi/polterwrite.c
	psi/psi.c
	psi/spss7.c
This commit is contained in:
koennecke
2012-06-05 09:09:20 +00:00
parent ecd96f9ab0
commit bd50b19178
21 changed files with 238 additions and 51 deletions

View File

@ -656,6 +656,7 @@ static int TASUBScanDrive(pScanData self, int iPoint)
int i, status, iPtr;
int iTAS = 0;
pMotor pMot;
pDynString err;
pTAS->ub->silent = 1;
/*
@ -665,7 +666,7 @@ static int TASUBScanDrive(pScanData self, int iPoint)
DynarGet(self->pScanVar, i, &pPtr);
pVar = (pVarEntry) pPtr;
if (pVar) {
StartMotor(pServ->pExecutor, self->pSics, self->pCon, pVar->Name,
status = StartMotor(pServ->pExecutor, self->pSics, self->pCon, pVar->Name,
RUNDRIVE, pVar->fStart + iPoint * pVar->fStep);
/*
Ignore errors. TAS scans continues when a motor runs into