- Changed FOCUS to writing data files through nxscript

faverage.c

@@ -471,7 +471,7 @@
      }
      return 1;
   }   
-
+/*----------------------------------------------------------------------*/
 HistInt *CheckBank(pFocusAverager self, SConnection *pCon, 
               int iLength, int iBank)
 {

fowrite.c

@@ -578,9 +578,9 @@
            return;
         }
      }
-     setFMDataPointer(lData,iTime,3);
-     setFMDataPointer(mData,iTime,1);
-     setFMDataPointer(uData,iTime,2);
+     setFMDataPointer(lData,iTime,LOWER);
+     setFMDataPointer(mData,iTime,MIDDLE);
+     setFMDataPointer(uData,iTime,UPPER);
      /* middle bank */
      if(self->iMiddle)
      {

psi.c

@@ -48,6 +48,7 @@
 #include <evdriver.i>
 #include "amorscan.h"
 #include "serial.h"
+#include "fomerge.h"
 
 static pSite sitePSI = NULL;
 
@@ -72,6 +73,7 @@ static void AddPsiCommands(SicsInterp *pInter){
     AddCommand(pInter,"MakeECB",MakeECB,NULL,NULL);
     AddCommand(pInter,"MakePSDFrame",MakeFrameFunc,NULL,NULL);
     AddCommand(pInter,"SerialInit",SerialInit,NULL,NULL);
+    AddCommand(pInter,"InstallFocusMerge",InstallFocusMerge,NULL,NULL);
 /*
     AddCommand(pInter,"MakeDifrac",MakeDifrac,NULL,NULL);
 */

swmotor2.c

@@ -116,7 +116,7 @@ static float SWGetValue(void *pData, SConnection *pCon)
   */
   if(self->myNumber != self->selectedMotor[0]) 
   {
-    SCWrite(pCon,"WARNING: motor not activem returning stored value",
+    SCWrite(pCon,"WARNING: motor not active, returning stored value",
             eWarning);
     return self->positions[self->myNumber];
   }
@@ -174,6 +174,7 @@ static long SWSetValue(void *pData, SConnection *pCon, float fVal)
     SCWrite(pCon,"Standby, starting reference run... ", eWarning);
     pElli = (EL734Driv *)self->pMaster->pDriver;
     sprintf(pCommand,"R %d\r",pElli->iMotor);
+    setRS232Timeout(pElli->controller,2000);
     status = transactRS232(pElli->controller,pCommand,strlen(pCommand),
 			   pError,131);
     if(status != 1)
@@ -316,7 +317,7 @@ int MakeSWHPMotor(SConnection *pCon, SicsInterp *pSics, void *pData,
   sw1->pDriv->CheckLimits = SWCheckLimits;
 
   /*
-   create clones of the new data structure ofr the other slaves
+   create clones of the new data structure of the other slaves
   */
   sw2 = (pSWmot)malloc(sizeof(SWmot));
   sw3 = (pSWmot)malloc(sizeof(SWmot));