- 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

@@ -105,7 +105,8 @@ static long SecMotorRun(void *sulf, SConnection * pCon, float fNew)
return 0;
}
self->stopped = 0;
self->stopReported = 0;
v = MakeHdbFloat(fNew);
status = SetHipadabaPar(self->pDescriptor->parNode, v, pCon);
node = GetHipadabaNode(self->pDescriptor->parNode, "status");
@@ -211,7 +212,10 @@ static int checkPosition(pMotor self, SConnection * pCon)
pHdb node = NULL;
if (self->stopped) {
SCPrintf(pCon, eWarning, "WARNING: %s stopped", self->name);
if(self->stopReported == 0){
SCPrintf(pCon, eLog, "WARNING: %s stopped", self->name);
self->stopReported = 1;
}
return HWFault;
}
if (SCGetInterrupt(pCon) != eContinue) {