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

Added functions to create the camera driver and init the camera protocol

Browse Source 
to site_ansto.c
This commit is contained in:
Ferdi Franceschini
2013-02-28 12:57:41 +11:00
parent abbe619a10 87559bf411
commit 86379e8038
5 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/cameradriver.h Normal file
View File

@@ -0,0 +1,4 @@
#ifndef CAMERADRIVER_H
#define CAMERADRIVER_H
void CameraInitProtocol(SicsInterp *pSics);
#endif

4
site_ansto/hardsup/cameradriver.h Normal file
View File

@@ -0,0 +1,4 @@
#ifndef CAMERADRIVER_H
#define CAMERADRIVER_H
void CameraInitProtocol(SicsInterp *pSics);
#endif

2
site_ansto/hardsup/makefile
View File

@@ -32,6 +32,8 @@ HOBJ += sct_rfamp.o
HOBJ += sinqhttpprot.o HOBJ += sinqhttpprot.o
HOBJ += sct_protek608.o HOBJ += sct_protek608.o
HOBJ += sct_lfprot.o HOBJ += sct_lfprot.o
HOBJ += camera.o
HOBJ += cameradriver.o
libhlib.a: $(HOBJ) libhlib.a: $(HOBJ)
rm -f libhlib.a rm -f libhlib.a

2
site_ansto/instrument/barebones.tcl
View File

@@ -9,7 +9,7 @@
# Required by server_config.tcl # Required by server_config.tcl
VarMake Instrument Text Internal VarMake Instrument Text Internal
Instrument echidna Instrument bear
Instrument lock Instrument lock
#START SERVER CONFIGURATION SECTION #START SERVER CONFIGURATION SECTION

5
site_ansto/site_ansto.c
View File

@@ -51,6 +51,7 @@
#include "safetyplc.h" #include "safetyplc.h"
#include "lssmonitor.h" #include "lssmonitor.h"
#include "beamstopaction.h" #include "beamstopaction.h"
#include "cameradriver.h"
/*@observer@*//*@null@*/ pCounterDriver CreateMonCounter(/*@observer@*/SConnection *pCon, /*@observer@*/char *name, char *params); /*@observer@*//*@null@*/ pCounterDriver CreateMonCounter(/*@observer@*/SConnection *pCon, /*@observer@*/char *name, char *params);
@@ -68,6 +69,7 @@ extern void AddTCPMBProtocol ();
extern void AddLFGenProtocol(); extern void AddLFGenProtocol();
extern int ANSTO_MakeHistMemory(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]); extern int ANSTO_MakeHistMemory(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]);
extern int testLogCmd(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]); extern int testLogCmd(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]);
extern pCounterDriver CreateCam(SConnection *pCon, char *name, char *asynq);
int SICS_Site(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]) int SICS_Site(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[])
{ {
@@ -203,6 +205,7 @@ static void AddCommands(SicsInterp *pInter)
NHQ200InitProtocol(pInter); NHQ200InitProtocol(pInter);
ORHVPSInitProtocol(pInter); ORHVPSInitProtocol(pInter);
LS340InitProtocol(pInter); LS340InitProtocol(pInter);
CameraInitProtocol(pInter);
AddCommand(pInter,"InstallProtocolHandler", InstallProtocol,NULL,NULL); AddCommand(pInter,"InstallProtocolHandler", InstallProtocol,NULL,NULL);
AddCommand(pInter,"hostnam",hostNamCmd,NULL,NULL); AddCommand(pInter,"hostnam",hostNamCmd,NULL,NULL);
AddCommand(pInter,"portnum",portNumCmd,NULL,NULL); AddCommand(pInter,"portnum",portNumCmd,NULL,NULL);
@@ -294,6 +297,8 @@ static pCounterDriver CreateCounterDriverAnsto(SConnection *pCon,
strtolower(argv[2]); strtolower(argv[2]);
if(strcmp(argv[2],"anstomonitor") == 0) { if(strcmp(argv[2],"anstomonitor") == 0) {
pDriver = CreateMonCounter(pCon, argv[1], argv[3]); pDriver = CreateMonCounter(pCon, argv[1], argv[3]);
} else if (strcmp(argv[2], "anstocamera") == 0) {
pDriver = CreateCam(pCon, argv[1], argv[3]);
} }
if(!pDriver){ if(!pDriver){
return NULL; return NULL;