- Added a AsconReadDoneReconnect to ascon. This handles the case better when

a server hangs up diretcly after a message.
- Some output was suppressed while tracing, fixed
- Make ready to compile both with Ubuntu 32 and 64 or /usr/local
  based ON in general. Just in psi/makefile_linux the top include has
  to be adapted
- Removed epics drivers from SICS. Still in source to be reenabled when
  needed
- Added FindMotor
- Added sput, sappend and slab to nxscript using the new sicsget module
- Fix to sget to fix the "mot softzero" problem

make_gen

@@ -24,8 +24,8 @@ OBJ=psi.o buffer.o ruli.o  sps.o pimotor.o charbychar.o\
 	ritastorage.o poldizug.o el737hpdrivsps.o \
 	rebin.o sanslirebin.o lmd200.o slsvme.o julprot.o sinqhttpprot.o \
 	pmacprot.o pfeifferprot.o termprot.o phytron.o autowin.o eigera2.o \
-	tclClock.o tclDate.o tclUnixTime.o jvlprot.o epicscounter.o \
+	tclClock.o tclDate.o tclUnixTime.o jvlprot.o  \
-	eigermono.o sputterprot.o
+	eigermono.o sputterprot.o zwickroll.o
 
 .SECONDARY.: sanslirebin.c
 

psi.c

@@ -74,6 +74,7 @@ void SiteInit(void)
   INIT(AddDumProtocol);
   INIT(AddJVLProtocoll);
   INIT(AddSputterProtocoll);
+  INIT(AddZwickrollProtocoll);
 
 }
 
@@ -224,6 +225,7 @@ static pCounterDriver CreatePsiCounterDriver(SConnection * pCon,
     pNew = MakeEL737hpsps(pCon, argv[1], argc - 3, &argv[3]);
   } else if (strcmp(argv[2], "el737hpv2") == 0) {
     pNew = MakeEL737HPV2(pCon, argv[1], argc - 3, &argv[3]);
+    /*
   } else if (strcmp(argv[2], "epics") == 0) {
     if (argc < 4) {
       SCWrite(pCon,
@@ -232,6 +234,7 @@ static pCounterDriver CreatePsiCounterDriver(SConnection * pCon,
       return NULL;
     }
     pNew = MakeEPICSCounter(argv[3]);
+    */
   }
   return pNew;
 }

sinqhttpopt.c

@@ -281,6 +281,7 @@ static void handleReply(Ascon * a)
     			  return;
     		  }
     		  pHttp->node->value.arrayLength = len;
+		  /* printf("SINQHTTPOPT setting length to %d\n", len); */
     	  }
 	  if(pHttp->byteSwap == 1){
 	    for(i = 0; i < len; i++){

spss7.c

@@ -339,7 +339,7 @@ static void InitializeSPSDataBase(pS7Action self, pHdb parent)
 			memcpy(&bval,pPtr+1,1);
 			hdbVal = MakeHdbInt(bval);
 			UpdateHipadabaPar(node,hdbVal,NULL);
-			snprintf(num,10,"%d", pPtr - self->replyData - 16);
+			snprintf(num,10,"%ld", (long)(pPtr - self->replyData - 16));
 			SetHdbProperty(node,"offset",num);
 			pPtr += 2;
 			break;
@@ -348,7 +348,7 @@ static void InitializeSPSDataBase(pS7Action self, pHdb parent)
 			memcpy(&ival,pPtr,4);
 			hdbVal = MakeHdbInt(ntohl(ival));
 			UpdateHipadabaPar(node,hdbVal,NULL);
-			snprintf(num,10,"%d", pPtr - self->replyData - 16);
+			snprintf(num,10,"%ld", (long)(pPtr - self->replyData - 16));
 			SetHdbProperty(node,"offset",num);
 			pPtr += 4;
 			break;
@@ -359,7 +359,7 @@ static void InitializeSPSDataBase(pS7Action self, pHdb parent)
 			memcpy(&fval,&ival,4);
 			hdbVal = MakeHdbFloat(fval);
 			UpdateHipadabaPar(node,hdbVal,NULL);
-			snprintf(num,10,"%d", pPtr - self->replyData + 2 - 16);
+			snprintf(num,10,"%ld", (long)(pPtr - self->replyData + 2 - 16));
 			SetHdbProperty(node,"offset",num);
 			pPtr += 6;
 			break;