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

- Changed FOCUS to writing data files through nxscript

Browse Source
This commit is contained in:
cvs
2004-05-04 14:06:17 +00:00
parent 55848218a4
commit ce6001e443
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
faverage.c
View File

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

6
fowrite.c
View File

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

2
psi.c
View File

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

5
swmotor2.c
View File

@ -116,7 +116,7 @@ static float SWGetValue(void *pData, SConnection *pCon)
*/ */
if(self->myNumber != self->selectedMotor[0]) 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); eWarning);
return self->positions[self->myNumber]; 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); SCWrite(pCon,"Standby, starting reference run... ", eWarning);
pElli = (EL734Driv *)self->pMaster->pDriver; pElli = (EL734Driv *)self->pMaster->pDriver;
sprintf(pCommand,"R %d\r",pElli->iMotor); sprintf(pCommand,"R %d\r",pElli->iMotor);
setRS232Timeout(pElli->controller,2000);
status = transactRS232(pElli->controller,pCommand,strlen(pCommand), status = transactRS232(pElli->controller,pCommand,strlen(pCommand),
pError,131); pError,131);
if(status != 1) if(status != 1)
@ -316,7 +317,7 @@ int MakeSWHPMotor(SConnection *pCon, SicsInterp *pSics, void *pData,
sw1->pDriv->CheckLimits = SWCheckLimits; 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)); sw2 = (pSWmot)malloc(sizeof(SWmot));
sw3 = (pSWmot)malloc(sizeof(SWmot)); sw3 = (pSWmot)malloc(sizeof(SWmot));