Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
9
velo.c
9
velo.c
@@ -479,7 +479,7 @@ int VSGetTilt(pVelSel self, float *fTilt)
|
||||
{
|
||||
assert(self);
|
||||
|
||||
return self->pTilt->pDriver->GetPosition(self->pTilt->pDriver, fTilt);
|
||||
return MotorGetSoftPosition(self->pTilt, pServ->dummyCon,fTilt);
|
||||
|
||||
}
|
||||
|
||||
@@ -588,10 +588,7 @@ int VSGetLossCurrent(pVelSel self, SConnection * pCon, float *fLoss)
|
||||
assert(self);
|
||||
assert(pCon);
|
||||
|
||||
eOld = GetStatus();
|
||||
SetStatus(eRunning);
|
||||
iRet = self->pDriv->GetLossCurrent(self->pDriv, fLoss);
|
||||
SetStatus(eOld);
|
||||
if (!iRet) {
|
||||
self->pDriv->GetError(self->pDriv, &iCode, pError, 131);
|
||||
snprintf(pBueffel,sizeof(pBueffel)-1, "ERROR: %s while trying to measure loss current",
|
||||
@@ -802,7 +799,7 @@ int VelSelFactory(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
}
|
||||
pT = InterpGetTcl(pSics);
|
||||
site = getSite();
|
||||
if (site != NULL) {
|
||||
if (site != NULL && site->CreateVelocitySelector != NULL) {
|
||||
pDriv = site->CreateVelocitySelector(argv[3], argv[4], pT);
|
||||
}
|
||||
if (!pDriv) {
|
||||
@@ -1161,9 +1158,7 @@ int VelSelAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
eError);
|
||||
return 0;
|
||||
}
|
||||
SetStatus(eDriving);
|
||||
iRet = VSSetTiltRot(self, pCon, fRot, fTilt);
|
||||
SetStatus(eEager);
|
||||
if (iRet) {
|
||||
SCSendOK(pCon);
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user