Add huber asyncprotocol and make huber_ap and omron_ap to remove name conflicts

This commit is contained in:
Douglas Clowes
2014-06-23 12:47:33 +10:00
parent 565ba9d10d
commit 6b18de0a03
7 changed files with 144 additions and 21 deletions

View File

@@ -59,6 +59,7 @@
#include "cameradriver.h"
#include "aqp_opalstatus.h"
#include "omron_asyncprotocol.h"
#include "huber_asyncprotocol.h"
/*@observer@*//*@null@*/ pCounterDriver CreateMonCounter(/*@observer@*/SConnection *pCon, /*@observer@*/char *name, char *params);
@@ -75,7 +76,6 @@ extern void AddRFAmpProtocol();
extern void AddTCPMBProtocol ();
extern void AddLFGenProtocol();
extern void AddSCAQAProtocol();
extern void OMRONInitProtocol(pInter);
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 pCounterDriver CreateCam(SConnection *pCon, char *name, char *asynq);
@@ -356,6 +356,7 @@ static void AddCommands(SicsInterp *pInter)
CameraInitProtocol(pInter);
OpalStatusInitProtocol(pInter);
OMRONInitProtocol(pInter);
HUBERInitProtocol(pInter);
AddCommand(pInter,"InstallProtocolHandler", InstallProtocol,NULL,NULL);
AddCommand(pInter,"hostnam",hostNamCmd,NULL,NULL);
AddCommand(pInter,"portnum",portNumCmd,NULL,NULL);