diff --git a/libpsi.a b/libpsi.a index 3a15d81..f710425 100644 Binary files a/libpsi.a and b/libpsi.a differ diff --git a/sinqhmdriv.c b/sinqhmdriv.c index 3336263..5875e52 100644 --- a/sinqhmdriv.c +++ b/sinqhmdriv.c @@ -450,7 +450,7 @@ pCon); self->data->iDim[0], xOff, xFac, - self->data->iDim[1], + self->data->iDim[1] + pInternal->extraDetector, yOff, yFac, pInternal->iBinWidth, diff --git a/tabledrive.c b/tabledrive.c index 0b51db3..70e1c48 100644 --- a/tabledrive.c +++ b/tabledrive.c @@ -40,7 +40,7 @@ static int TableDriveHalt(void *pData){ if(moti.pMot != NULL){ moti.pMot->pDrivInt->Halt(moti.pMot); } - status == LLDnodePtr2Next(self->motorTable); + status = LLDnodePtr2Next(self->motorTable); } self->state = OUTOFSYNC; return 1; @@ -383,6 +383,10 @@ static int TableDriveCheckStatus(void *pData, SConnection *pCon){ return status; } break; + case OUTOFSYNC: + SCWrite(pCon,"WARNING: tabledrive out of sync",eWarning); + return HWFault; + break; default: SCWrite(pCon, "ERROR: programming error in tabledrive, invalid state",