- Fixed putpos bug in ecbdriv.c

- 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

anticollider.c

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

counter.c

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

drive.c

@@ -364,12 +364,16 @@
       }
 
       /* check the completion status */
+      if(!(eOld == eScanning || eOld == eBatch))
+      {
+	eOld = eEager;
+      } 
       if(iRet == DEVERROR)
       {
         sprintf(pBueffel,"Driving finished with problem");
         SCWrite(pCon,pBueffel,eError);
         ClearExecutor(GetExecutor());
-        SetStatus(eOld);
+        SetStatus(eOld); 
         return 0;
       }
       else if(iRet == DEVINT)

makefile_linux

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

matrix/makefile_linux

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

motor.c

@@ -13,7 +13,7 @@
      Copyright:
 
      Labor fuer Neutronenstreuung
-     Paul Scherrer Institut
+     Paul Scherrer Institut 
      CH-5423 Villigen-PSI