linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed putpos bug in ecbdriv.c

Browse Source 
- Improved handling of conflicting drive commands in ecbdriv.c
- Better status codes after drive command
- Better error handling in anticollider


SKIPPED:
	psi/ecbdriv.c
	psi/makefile_linux
	psi/tecs/makefile_linux
This commit is contained in:
cvs
2003-09-04 07:15:37 +00:00
parent ee81bcc3b7
commit 4aae89fcde
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
anticollider.c
View File

@ -162,7 +162,10 @@ static int ColliderCheckStatus(void *pData, SConnection *pCon){
Most of these are dummies........ Most of these are dummies........
-----------------------------------------------------------------------*/ -----------------------------------------------------------------------*/
static int ColliderHalt(void *pData){ static int ColliderHalt(void *pData){
StopExe(pServ->pExecutor,"all"); pAntiCollider self = (pAntiCollider) pData;
StopAllMotors(self->motorList);
self->level = 999999999;
return 1; return 1;
} }
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
@ -178,7 +181,7 @@ static float ColliderGetValue(void *self, SConnection *pCon){
int StartLevel(int level, int sequenceList, int motorList, SConnection *pCon){ int StartLevel(int level, int sequenceList, int motorList, SConnection *pCon){
Sequence seq; Sequence seq;
pMotReg pMot = NULL; pMotReg pMot = NULL;
int iRet; int iRet, status;
int count = 0; int count = 0;
char pBueffel[132]; char pBueffel[132];
@ -188,8 +191,10 @@ int StartLevel(int level, int sequenceList, int motorList, SConnection *pCon){
if(seq.level == level){ if(seq.level == level){
pMot = FindMotEntry(motorList,seq.pMotor); pMot = FindMotEntry(motorList,seq.pMotor);
if(pMot){ if(pMot){
StartRegMot(pMot,pCon,seq.target); status = StartRegMot(pMot,pCon,seq.target);
count++; if(status){
count++;
}
} else { } else {
sprintf(pBueffel,"ERROR: motor %s, requested from anticollider script", sprintf(pBueffel,"ERROR: motor %s, requested from anticollider script",
seq.pMotor); seq.pMotor);

3
counter.c
View File

@ -154,7 +154,8 @@
iRet = self->pDriv->TryAndFixIt(self->pDriv,iErr); iRet = self->pDriv->TryAndFixIt(self->pDriv,iErr);
if(iRet == COTERM) if(iRet == COTERM)
{ {
SCWrite(pCon,"ERROR: Cannot fix counter problem, aborting",eError); SCWrite(pCon,"ERROR: Cannot fix counter problem, aborting",
eError);
SCSetInterrupt(pCon,eAbortBatch); SCSetInterrupt(pCon,eAbortBatch);
return HWFault; return HWFault;
} }

4
drive.c
View File

@ -364,6 +364,10 @@
} }
/* check the completion status */ /* check the completion status */
if(!(eOld == eScanning || eOld == eBatch))
{
eOld = eEager;
}
if(iRet == DEVERROR) if(iRet == DEVERROR)
{ {
sprintf(pBueffel,"Driving finished with problem"); sprintf(pBueffel,"Driving finished with problem");

6
makefile_linux
View File

@ -9,13 +9,11 @@
#NI= -DHAVENI #NI= -DHAVENI
#NIOBJ= nigpib.o #NIOBJ= nigpib.o
#NILIB=-lgpibenet #NILIB=-lgpibenet
#---------------------------------------------------------------------------
include $(SRC)linux_def include linux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \ CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -Ipsi/hardsup -I. \
-I$(SRC)psi/hardsup -I$(SRC). \
-fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
BINTARGET = bin BINTARGET = bin

2
matrix/makefile_linux
View File

@ -6,7 +6,7 @@
# Markus Zolliker, March 2003 # Markus Zolliker, March 2003
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
include ../$(SRC)linux_def include ../linux_def
CC = gcc CC = gcc
CFLAGS = -g $(DFORTIFY) CFLAGS = -g $(DFORTIFY)