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

Added create drive command to site ansto

Browse Source 
r1037 | ffr | 2006-08-01 17:03:00 +1000 (Tue, 01 Aug 2006) | 2 lines
This commit is contained in:
Ferdi Franceschini
2006-08-01 17:03:00 +10:00
committed by Douglas Clowes
parent 2fe58f2839
commit 3da52afb10
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
site_ansto/counterdriv.c
View File

@ -63,9 +63,7 @@ typedef struct {
prs232 controller; prs232 controller;
char *host; char *host;
int iPort; int iPort;
int iChannel; float dummy_threshold;
void *pData;
int finishCount;
} BeamMon; } BeamMon;
/** \brief Returns the counter status, /** \brief Returns the counter status,
@ -171,13 +169,22 @@ static int MonTryAndFixIt(CounterDriver *cntrData, int iCode) {
static int MonSet(CounterDriver *cntrData, char *name, int iCter, float FVal) { static int MonSet(CounterDriver *cntrData, char *name, int iCter, float FVal) {
BeamMon *self = NULL; BeamMon *self = NULL;
self = (BeamMon *) cntrData; self = cntrData->pData;
if(strcmp(name,"threshold") == 0){
//TODO set threshold
self->dummy_threshold = FVal;
}
} }
static int MonGet(CounterDriver *cntrData, char *name, int iCter, float *fVal) { static int MonGet(CounterDriver *cntrData, char *name, int iCter, float *fVal) {
BeamMon *self = NULL; BeamMon *self = NULL;
self = (BeamMon *) cntrData; self = cntrData->pData;
if(strcmp(name,"threshold") == 0){
//TODO get threshold
*fVal = self->dummy_threshold;
}
*fVal = 123456789.0; *fVal = 123456789.0;
} }
@ -240,7 +247,7 @@ static void KillMon(pCounterDriver self) {
eError); eError);
return NULL; return NULL;
} }
pCntDriv = CreateCounterDriver(name, "MONITOR"); pCntDriv = CreateCounterDriver(name, "anstomonitor");
if(!pCntDriv) { if(!pCntDriv) {
free(newCtr); free(newCtr);
return NULL; return NULL;
@ -271,6 +278,7 @@ static void KillMon(pCounterDriver self) {
strncpy(buffer,pPtr, 131); strncpy(buffer,pPtr, 131);
newCtr->controller = MonConnect(pCon, buffer, port); newCtr->controller = MonConnect(pCon, buffer, port);
newCtr->dummy_threshold = 1.7e6;
return pCntDriv; return pCntDriv;
} }

19
site_ansto/site_ansto.c
View File

@ -24,6 +24,9 @@
/* Added code for new LH45 and Lakeshore 340 drivers */ /* Added code for new LH45 and Lakeshore 340 drivers */
#include "lh45.h" #include "lh45.h"
#include "lakeshore340.h" #include "lakeshore340.h"
/*@observer@*//*@null@*/ pCounterDriver CreateMonCounter(/*@observer@*/SConnection *pCon, /*@observer@*/char *name, char *params);
/* /*
from tcpdornier.c from tcpdornier.c
*/ */
@ -104,17 +107,15 @@ static void RemoveCommands(SicsInterp *pSics){
static pCounterDriver CreateCounterDriverAnsto(SConnection *pCon, static pCounterDriver CreateCounterDriverAnsto(SConnection *pCon,
int argc, int argc,
char *argv[]){ char *argv[]){
pCounterDriver pNew = NULL; pCounterDriver pDriver = NULL;
if(strcmp(argv[2],"nitio10") == 0){ strtolower(argv[2]);
if(argc < 4){ if(strcmp(argv[2],"anstomonitor") == 0) {
SCWrite(pCon, pDriver = CreateMonCounter(pCon, argv[1], argv[3]);
"ERROR:SITE: Insufficient arguments for NITIO10 counter", }
eError); if(!pDriver){
return NULL; return NULL;
} }
/* pNew = CreateCtrNitio10(pCon,argv[1],argc-3,&argv[3]);*/ return pDriver;
}
return pNew;
} }
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
static HistDriver *CreateHistMem(char *name, pStringDict pOptions){ static HistDriver *CreateHistMem(char *name, pStringDict pOptions){