- Removed old code
- Extended tasker to support task groups - Added task functions for motors and counters - Modifed devexec to use the new task functions - Modified TAS to treat the monochromator separatly - Coded a EIGER monochromator module to reflect even more new requirements - Added EPICS counters and motors - Modified multicounter to be better performing SKIPPED: psi/eigermono.c psi/make_gen psi/makefile_linux psi/psi.c psi/sinqhttp.c
This commit is contained in:
15
ofac.c
15
ofac.c
@ -17,6 +17,8 @@
|
||||
#include "site.h"
|
||||
#include "sicshipadaba.h"
|
||||
|
||||
static unsigned int killStartupCommands = 1;
|
||||
|
||||
extern void DevExecInit(void); /* devexec.c */
|
||||
/*--------------------------------------------------------------------------*/
|
||||
static void InitGeneral(void)
|
||||
@ -44,6 +46,7 @@ static void InitGeneral(void)
|
||||
INIT(AddGenBinProtocoll);
|
||||
INIT(AddSyncedProt);
|
||||
INIT(MakeTrace);
|
||||
INIT(InitTaskOBJ);
|
||||
INIT(SiteInit); /* site specific initializations */
|
||||
}
|
||||
|
||||
@ -111,6 +114,7 @@ static void InitIniCommands(SicsInterp * pInter)
|
||||
PCMD("TclReplaceDrivable", TclReplaceDrivable);
|
||||
PCMD("transact", TransactAction);
|
||||
PCMD("wait", UserWait);
|
||||
PCMD("yield", UserYield);
|
||||
PCMD("checksum", CheckSum);
|
||||
|
||||
/* startup commands in alphabetic order */
|
||||
@ -169,7 +173,6 @@ static void InitIniCommands(SicsInterp * pInter)
|
||||
SCMD("SicsAlias", SicsAlias);
|
||||
SCMD("SicsUser", PWSicsUser);
|
||||
SCMD("TokenInit", TokenInit);
|
||||
SCMD("MakeTask", TaskOBJFactory);
|
||||
SCMD("UpdateFactory", UpdateFactory);
|
||||
SCMD("VarMake", VarFactory);
|
||||
SCMD("VelocitySelector", VelSelFactory);
|
||||
@ -229,7 +232,13 @@ int InitObjectCommands(pServer pServ, char *file)
|
||||
if (site != NULL && site->RemoveSiteCommands != NULL) {
|
||||
site->RemoveSiteCommands(pSics);
|
||||
}
|
||||
|
||||
RemoveStartupCommands();
|
||||
if(killStartupCommands){
|
||||
RemoveStartupCommands();
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
void KeepStartupCommands()
|
||||
{
|
||||
killStartupCommands = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user