Removed obsolete sinfox command
Removed last traces of sycamore protocol
This commit is contained in:
2
make_gen
2
make_gen
@ -33,7 +33,7 @@ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
|
|||||||
s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) mcreader.o mccontrol.o\
|
s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) mcreader.o mccontrol.o\
|
||||||
hmdata.o nxscript.o tclintimpl.o sicsdata.o mcstascounter.o \
|
hmdata.o nxscript.o tclintimpl.o sicsdata.o mcstascounter.o \
|
||||||
mcstashm.o initializer.o remob.o tclmotdriv.o protocol.o \
|
mcstashm.o initializer.o remob.o tclmotdriv.o protocol.o \
|
||||||
sinfox.o sicslist.o cone.o hipadaba.o sicshipadaba.o statistics.o \
|
sicslist.o cone.o hipadaba.o sicshipadaba.o statistics.o \
|
||||||
ascon.o scriptcontext.o logger.o logreader.o logsetup.o \
|
ascon.o scriptcontext.o logger.o logreader.o logsetup.o \
|
||||||
savehdb.o statusfile.o sicshdbfactory.o proxy.o devser.o \
|
savehdb.o statusfile.o sicshdbfactory.o proxy.o devser.o \
|
||||||
moregress.o multicounter.o regresscter.o histregress.o \
|
moregress.o multicounter.o regresscter.o histregress.o \
|
||||||
|
1
ofac.c
1
ofac.c
@ -132,7 +132,6 @@ static void InitIniCommands(SicsInterp * pInter)
|
|||||||
SCMD("allowexec", AllowExec);
|
SCMD("allowexec", AllowExec);
|
||||||
SCMD("AntiCollisionInstall", AntiColliderFactory);
|
SCMD("AntiCollisionInstall", AntiColliderFactory);
|
||||||
SCMD("ChopperAdapter", CHAdapterFactory);
|
SCMD("ChopperAdapter", CHAdapterFactory);
|
||||||
SCMD("InstallSinfox", InstallSinfox);
|
|
||||||
SCMD("MakeBatchManager", MakeExeManager);
|
SCMD("MakeBatchManager", MakeExeManager);
|
||||||
SCMD("MakeChopper", ChocoFactory);
|
SCMD("MakeChopper", ChocoFactory);
|
||||||
SCMD("MakeCone", MakeCone);
|
SCMD("MakeCone", MakeCone);
|
||||||
|
@ -88,7 +88,6 @@ static int EnumChoice(char *pList[], int iLength, char *pInput);
|
|||||||
static int InitDefaultProtocol(SConnection * pCon, Protocol * pPro);
|
static int InitDefaultProtocol(SConnection * pCon, Protocol * pPro);
|
||||||
|
|
||||||
/* Signatures for protocol writers implemented in this file */
|
/* Signatures for protocol writers implemented in this file */
|
||||||
int SCWriteSycamore(SConnection * pCon, char *pBuffer, int iOut);
|
|
||||||
int SCWriteJSON_String(SConnection * pCon, char *pBuffer, int iOut);
|
int SCWriteJSON_String(SConnection * pCon, char *pBuffer, int iOut);
|
||||||
/* Signatures for protocols from conman.c*/
|
/* Signatures for protocols from conman.c*/
|
||||||
extern int SCAllWrite(SConnection * self, char *buffer, int iOut);
|
extern int SCAllWrite(SConnection * self, char *buffer, int iOut);
|
||||||
|
115
sinfox.h
115
sinfox.h
@ -1,115 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------
|
|
||||||
----------------------------------------------------------------------------*/
|
|
||||||
#ifndef ANSTO_SINFOX
|
|
||||||
#define ANSTO_SINFOX
|
|
||||||
#include <sics.h>
|
|
||||||
#include <conman.h>
|
|
||||||
|
|
||||||
typedef struct __Sinfox {
|
|
||||||
pObjectDescriptor pDes; /* required as first field */
|
|
||||||
const char *buildVersion;
|
|
||||||
const char *configName;
|
|
||||||
const char *configVersion;
|
|
||||||
const char *description;
|
|
||||||
const char *instrument;
|
|
||||||
const char *schemaVersion;
|
|
||||||
Tcl_Interp *tTcl;
|
|
||||||
} Sinfox;
|
|
||||||
|
|
||||||
typedef struct __Sinfox *pSinfox;
|
|
||||||
|
|
||||||
#ifndef SICSSITE /* Avoid duplicate declaration in site_ansto.c */
|
|
||||||
|
|
||||||
const int iNumInfoKeys = 6;
|
|
||||||
char *pInfoKeys[7] = {
|
|
||||||
"buildVersion",
|
|
||||||
"configName",
|
|
||||||
"configVersion",
|
|
||||||
"description",
|
|
||||||
"instrument",
|
|
||||||
"schemaVersion",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
const int iNumCommandKeys = 3;
|
|
||||||
char *pCommandKeys[4] = {
|
|
||||||
"argument",
|
|
||||||
"device",
|
|
||||||
"interface",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
const int iNumDeviceKeys = 3;
|
|
||||||
char *pDeviceKeys[4] = {
|
|
||||||
"attribute",
|
|
||||||
"command",
|
|
||||||
"interface",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
const int iNumDeviceTypes = 24;
|
|
||||||
char *pDeviceTypes[25] = {
|
|
||||||
"4-circle-calculus",
|
|
||||||
"anticollider",
|
|
||||||
"chopper",
|
|
||||||
"chopperadaptor",
|
|
||||||
"connection",
|
|
||||||
"crystalselector",
|
|
||||||
"environment monitor",
|
|
||||||
"environment_controller",
|
|
||||||
"gpib",
|
|
||||||
"hklscan",
|
|
||||||
"hmcontrol",
|
|
||||||
"lin2ang",
|
|
||||||
"local maximum detector",
|
|
||||||
"maximizer",
|
|
||||||
"mesure",
|
|
||||||
"motor",
|
|
||||||
"mulmot",
|
|
||||||
"omega2theta",
|
|
||||||
"rs232 controller",
|
|
||||||
"scanobject",
|
|
||||||
"sicsvariable",
|
|
||||||
"singlecounter",
|
|
||||||
"velocityselector",
|
|
||||||
"xytable",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
const int iNumIFaces = 4;
|
|
||||||
char *pIFaces[5] = {
|
|
||||||
"callback",
|
|
||||||
"countable",
|
|
||||||
"drivable",
|
|
||||||
"environment",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
const int iNumServerKeys = 10;
|
|
||||||
char *pServerKeys[11] = {
|
|
||||||
"help",
|
|
||||||
"list",
|
|
||||||
"command",
|
|
||||||
"connection",
|
|
||||||
"device",
|
|
||||||
"devicetype",
|
|
||||||
"experiment",
|
|
||||||
"group",
|
|
||||||
"interface",
|
|
||||||
"key",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* SICSSITE */
|
|
||||||
|
|
||||||
/*--------------------- lifecycle -------------------------------------- */
|
|
||||||
int InstallSinfox(SConnection * pCon, SicsInterp * pSics, void *pData,
|
|
||||||
int argc, char *argv[]);
|
|
||||||
void DeleteSinfox(void *pSelf);
|
|
||||||
|
|
||||||
/*--------------------- operations --------------------------------------*/
|
|
||||||
int SinfoxAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
|
||||||
int argc, char *argv[]);
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------*/
|
|
||||||
#endif /* ANSTO_SINFOX */
|
|
Reference in New Issue
Block a user