e36e9f1146
Reduce log noise by setting iout = eInternal for macros. servlog.c Fixed timestamp in logfiles to get hours. hmm_configuration_common_1.tcl Added ML's mods to wombat config: ie BAT and FAT TABLE attributes and elements for multi-period acquisition and histo-streaming. Fixed "failed lsearch" bug. It's more robust to test for a non-successful lsearch instead of a failed lsearch. nxscripts_common_1.tcl SICS-297 Fixed Saving data series in a scratch file overwrites earlier entries. instdict_specification.tcl Added "scobj" kind and "sct_indexed_motor" sics object type for script context controllers and and objects. hipadaba_configuration_common.tcl Added sct_indexed_motor sics obj type to ::hdb::sobjadd and scobj kind to ::hdb::add_node sct_positmotor_common.tcl Update the index SICS variable when updating the current index value to make sure that the position is saved in the data file. You must now provide the hdb node_name when creating the sct posit motor. mk_sct_positmotor now sets the "param" and "long_name" attributes on the posit motor object util/utility.tcl Added ::utility::set_sct_indexed_motor_attributes to set SICS object attributes required for generating hdb info for an SCT_POSIT_MOTOR nxscript.c Merge the ansto mod to putslab (rev1.7) which adds support for saving unbuffered data from the histmem. sicshipadaba.c This incorporates the patch made to CommandSetCallback in rev1.10 so it can just be copied as is (ie no merge required). WARNING: There are changes to ListHdbNode to handle record separators which may affect us. Disabled sending hdb command start and stop messages because they break gumtree sicshdbfactory.c Disabled sending hdb command start and stop messages because they break gumtree hipadaba_configuration_common.tcl R2.4DEV The sct_posit_motor case of ::hdb::sobjadd is only needed to call add_node with kind=scobj. nxscripts_common_1.tcl R2.4DEV Added ::nexus::scobj::sdsinfo _gen_nxdict now skips nodes with data_type == "none" new util/script_context_util.tcl R2.4DEV Adds ::scobj::hinitprops command to initialise the hdb properties for script context object nodes. sct_positmotor_common.tcl R2.4DEV Use ::scobj::hinitprops utility command to initialise hdb properties on script context object parameter nodes. dynstring.c DynStringReplace should memcopy '\0', otherwise it can get the wrong length for iTextLen. Added DynStringReplaceWithLen to allow initialising a dynstring with char arrays which contain null chars and other non-ascii chars. Useful for read and write buffers in script context. ascon.c AsconRead return NULL for noResponse and AsconFailed otherwise the "result" node gets set with a spurious empty value. scriptcontext.c SctActionHandler only set the "result" node if there really is a reply. sicsobj.c Update from M.K. site_ansto.c Added galil and ordela hvps protocol handlers for scriptcontext. motor_dmc2280.c Allow home parameter to be outside of limits (for KOWARI) hardsup/makefile Added ordela HVPS protocol handler hardsup/sct_orhvpsprot.c New ordela HVPS protocol handler. Retries on NAKs and re-orders pot channels (ie toggles lower two bits). hardsup/sct_velselprot.c Start velocity selector protocol handler. hardsup/sct_galilprot.c Completed galil protocol handler. hipadaba_configuration_common.tcl Add new style SICS objects to hdb tree. instdict_specification.tcl Added scobj to kind list and sct_motor to sics object list. (and some housekeeping) hmm_configuration_common_1.tcl Added ratemaps to simulation. Fixe BAT_TABLE and added PERIOD_INDICES as per Mark Lesha's mods for multi-period acquisition. ratemaps now return float. sct_postimotor_common.tcl Now setting properties on the posit motor object so that it can be automatically added to the hdb tree. hrpd/config/motors/motor_configuration.tcl Fixed simulated msd motor so that it's handle properly in the hdb layer. sans/config/hmm/detector_ordela.tcl Updated the ordela calibration script to use the new sct_orhvpsprop.c script context controller. quokka_configuration.tcl Deleted lines which set the hdb properties for script context posit motors. This is now handled automatically as for other SICS objects. utility.tcl setpos now replaces the motor setpos subcommand. Added functions to set script context object attributes and sct_posit motor attributes. Created hparPath and hsibPath convenience commands for new-style SICS objects. script_context_util.tcl NEW! Adds hinitprops function to initialise the hdb properties for a script context object r2758 | ffr | 2008-12-12 17:53:53 +1100 (Fri, 12 Dec 2008) | 113 lines
71 lines
2.9 KiB
C
71 lines
2.9 KiB
C
/**
|
|
* This is the header file for the new (as of 2007) style SICS objects
|
|
*
|
|
* copyright: see file COPYRIGHT
|
|
*
|
|
* Mark Koennecke, July 2007
|
|
*/
|
|
#ifndef SICSOBJ2_H_
|
|
#define SICSOBJ2_H_
|
|
#include <stdio.h>
|
|
#include <hipadaba.h>
|
|
#include "sics.h"
|
|
/*======================================================================
|
|
* Be careful when changing this data structure. It has to be compatible
|
|
* in its first fields with the SICS object descriptor as defined in
|
|
* obdes.h in order to achieve backwards compatibility with old style
|
|
* SICS objects.
|
|
* =====================================================================*/
|
|
typedef struct {
|
|
pObjectDescriptor pDes;
|
|
pHdb objectNode;
|
|
void *pPrivate;
|
|
void (*KillPrivate) (void *pPrivate);
|
|
} SICSOBJ, *pSICSOBJ;
|
|
/*-----------------------------------------------------------------------*/
|
|
typedef int (*SICSOBJFunc) (pSICSOBJ self, SConnection * pCon,
|
|
pHdb commandNode, pHdb par[], int nPar);
|
|
/*======================= Live & Death =================================*/
|
|
pSICSOBJ MakeSICSOBJ(char *name, char *class);
|
|
pSICSOBJ MakeSICSOBJv(char *name, char *class, int type, int priv);
|
|
void KillSICSOBJ(void *data);
|
|
void DefaultKill(void *data);
|
|
void DefaultFree(void *data);
|
|
|
|
/* register a callback for killing the command when the node is killed */
|
|
void RegisterSICSOBJKillCmd(pSICSOBJ sicsobj, char *name);
|
|
|
|
int SaveSICSOBJ(void *data, char *name, FILE * fd);
|
|
|
|
/**
|
|
* This creates a new SICS object and installs it in the interpreter. It returns
|
|
* the newly created SICS object such that the caller can continue
|
|
* configuring it.
|
|
*/
|
|
pSICSOBJ SetupSICSOBJ(SConnection * pCon, SicsInterp * pSics, void *pData,
|
|
int argc, char *argv[]);
|
|
/**
|
|
* runObjectFunction is an internal function for running an existing object
|
|
* command. The user has to search the node first, prime the parameters,
|
|
* and then call this command to actually execute.
|
|
* @param object The object on which the command is executed
|
|
* @param pCon a connection to use for error reporting
|
|
* @param commandNode The node to invoke.
|
|
*/
|
|
int runObjFunction(pSICSOBJ object, SConnection *pCon, pHdb commandNode);
|
|
|
|
/*====================== Interpreter Interface ===========================
|
|
* InvokeSICSObj is special in that it returns -1 if it cannot handle
|
|
* the command. This leaves calling code the opportunity to process
|
|
* further commands.It returns 1 on success and 0 on failures though.
|
|
* ------------------------------------------------------------------------*/
|
|
int InvokeSICSOBJ(SConnection * pCon, SicsInterp * pSics, void *pData,
|
|
int argc, char *argv[]);
|
|
int InterInvokeSICSOBJ(SConnection * pCon, SicsInterp * pSics, void *pData,
|
|
int argc, char *argv[]);
|
|
int InstallSICSOBJ(SConnection * pCon, SicsInterp * pSics, void *pData,
|
|
int argc, char *argv[]);
|
|
|
|
|
|
#endif /*SICSOBJ2_H_ */
|