Commit Graph

156 Commits

Author SHA1 Message Date
Ferdi Franceschini
e36e9f1146 conman.c
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
2012-11-15 16:56:43 +11:00
Ferdi Franceschini
121aac2946 Tested OK on development controller
r2747 | ffr | 2008-11-18 10:40:03 +1100 (Tue, 18 Nov 2008) | 2 lines
2012-11-15 16:56:38 +11:00
Ferdi Franceschini
283c7d56dc nxscript.c SICS-295
Restored a modification made in revision 1.7 which was reverted during the PSI update (2/10/08) probably when investigating SICS-291

hmm_configuration_common_1.tcl
Added hmm ratemap_xy_max_bin and ratemap_xy_total

site_ansto/hardsup/sct_galilprot.c
site_ansto/hardsup/makefile
Started adding galil protocol for script-context controllers.

sans/config/parameters/parameters.tcl
SICS-180 BeamCenterY should have been BeamCenterZ

r2742 | ffr | 2008-11-07 10:13:51 +1100 (Fri, 07 Nov 2008) | 13 lines
2012-11-15 16:56:34 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:17 +11:00
Douglas Clowes
e20d3f0f63 remove old nhq driver
r2586 | dcl | 2008-05-29 14:48:48 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:16 +11:00
Douglas Clowes
c44ad5a097 Remove serialsinq
r2487 | dcl | 2008-04-24 12:12:47 +1000 (Thu, 24 Apr 2008) | 2 lines
2012-11-15 13:36:09 +11:00
Douglas Clowes
d2564a7838 suppress "not used" diagnostics, remove serialsinq
r2418 | dcl | 2008-04-14 08:41:08 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:25 +11:00
Douglas Clowes
46d79274a5 fix missing pointer dereferences, change SerialError to getRS232Error
r2417 | dcl | 2008-04-14 08:40:07 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:21 +11:00
Douglas Clowes
0427d9acea fix missing return, change SerialError to getRS232Error
r2416 | dcl | 2008-04-14 08:39:00 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:17 +11:00
Douglas Clowes
519bf308fa fix missing return from ITC4_Config, change SerialError to getRS232Error, adjust Formatting
r2415 | dcl | 2008-04-14 08:37:57 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:13 +11:00
Douglas Clowes
895e52bfe9 Remove unused variables and code
r2414 | dcl | 2008-04-14 08:33:45 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:10 +11:00
Douglas Clowes
cad1e0a4d5 Handle change to asyncqueue to handle binary protocols
r2280 | dcl | 2008-01-15 12:37:52 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:08 +11:00
Ferdi Franceschini
3077fddc3b We now take care of our own copy of the astrium chopper driver. It has the following changes.
Status is now updated on demand.
A status request returns a ready status message for the chopper as well as updating the chopper parameters.
We don't compensate for MW CMW on choppers 2 and 3.
PHASETOL=0.2
You can read the frequency from chopper one.

r2193 | ffr | 2007-10-23 12:58:13 +1000 (Tue, 23 Oct 2007) | 8 lines
2012-11-15 13:26:42 +11:00
Ferdi Franceschini
c36768a722 Removed junk which that dopey computer in the Koala cabin keeps pasting into files.
r2145 | ffr | 2007-09-03 12:52:35 +1000 (Mon, 03 Sep 2007) | 2 lines
2012-11-15 13:23:47 +11:00
Mark Lesha
65550b1fb8 Mark Lesha - General Debugging
r2144 | mle | 2007-09-03 12:36:02 +1000 (Mon, 03 Sep 2007) | 2 lines
2012-11-15 13:23:44 +11:00
Mark Lesha
69e67f0e67 Mark Lesha - General debug
r2143 | mle | 2007-09-03 12:35:36 +1000 (Mon, 03 Sep 2007) | 2 lines
2012-11-15 13:23:40 +11:00
Mark Lesha
e76c3922f0 Fixed general bugs.
r2139 | mle | 2007-08-23 15:08:52 +1000 (Thu, 23 Aug 2007) | 2 lines
2012-11-15 13:23:26 +11:00
Douglas Clowes
377ce04879 Fix warnings for printf formats
r1975 | dcl | 2007-05-22 08:29:38 +1000 (Tue, 22 May 2007) | 2 lines
2012-11-15 13:17:59 +11:00
Douglas Clowes
6d449014fc remove misleading comment
r1974 | dcl | 2007-05-22 08:15:56 +1000 (Tue, 22 May 2007) | 2 lines
2012-11-15 13:17:55 +11:00
Douglas Clowes
a18500cbf0 multichan becomes AsyncQueue and AsyncProtocol
r1957 | dcl | 2007-05-11 17:28:31 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:16:58 +11:00
Douglas Clowes
cff3ac6553 Added code for counter source filtering
r1848 | dcl | 2007-04-12 15:54:04 +1000 (Thu, 12 Apr 2007) | 2 lines
2012-11-15 13:14:25 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk.
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
2012-11-15 13:13:55 +11:00
Douglas Clowes
613793a782 remove "button" code that breaks Internet Explorer
r1669 | dcl | 2007-03-19 14:09:21 +1100 (Mon, 19 Mar 2007) | 2 lines
2012-11-15 13:07:37 +11:00
Douglas Clowes
36780e52ea timeout handling
r1661 | dcl | 2007-03-16 09:06:29 +1100 (Fri, 16 Mar 2007) | 2 lines
2012-11-15 13:07:12 +11:00
Douglas Clowes
696227ffc8 Huge changes, remove non-multichan code
r1511 | dcl | 2007-02-19 12:33:58 +1100 (Mon, 19 Feb 2007) | 2 lines
2012-11-15 13:00:07 +11:00
Douglas Clowes
6de7c8773f Add -Wall compiler option
r1510 | dcl | 2007-02-19 12:33:27 +1100 (Mon, 19 Feb 2007) | 2 lines
2012-11-15 13:00:04 +11:00
Douglas Clowes
ed807f20a1 remove extraneous "#include serialsinq.h"
r1427 | dcl | 2007-02-05 11:50:20 +1100 (Mon, 05 Feb 2007) | 2 lines
2012-11-15 12:57:39 +11:00
Douglas Clowes
4ba495d988 Largely comments and formatting
r1426 | dcl | 2007-02-05 11:38:40 +1100 (Mon, 05 Feb 2007) | 2 lines
2012-11-15 12:57:36 +11:00
Douglas Clowes
c4f4ea358d robustness
r1402 | dcl | 2007-01-17 09:43:33 +1100 (Wed, 17 Jan 2007) | 2 lines
2012-11-15 12:56:41 +11:00
Douglas Clowes
9ca1b3199a Debounce digital inputs
r1387 | dcl | 2007-01-09 11:15:02 +1100 (Tue, 09 Jan 2007) | 2 lines
2012-11-15 12:56:09 +11:00
Douglas Clowes
a488705540 Add NHQ200 HV Power Supply Driver
r1385 | dcl | 2006-12-21 17:50:19 +1100 (Thu, 21 Dec 2006) | 2 lines
2012-11-15 12:56:03 +11:00
Douglas Clowes
85d41577b3 Force close of socket on unexpected error
r1309 | dcl | 2006-11-21 12:37:02 +1100 (Tue, 21 Nov 2006) | 2 lines
2012-11-15 12:53:48 +11:00
Douglas Clowes
ea7ef49557 Documentation corrections
r1293 | dcl | 2006-11-15 08:42:05 +1100 (Wed, 15 Nov 2006) | 2 lines
2012-11-15 12:53:07 +11:00
Douglas Clowes
6928921378 Re-factor device specific code
r1292 | dcl | 2006-11-15 08:41:53 +1100 (Wed, 15 Nov 2006) | 2 lines
2012-11-15 12:53:05 +11:00
Douglas Clowes
2c1d9a0443 Limit source parameter range
r1291 | dcl | 2006-11-15 08:41:25 +1100 (Wed, 15 Nov 2006) | 2 lines
2012-11-15 12:53:02 +11:00
Douglas Clowes
58099af3da Push down device specific code
r1290 | dcl | 2006-11-15 08:38:29 +1100 (Wed, 15 Nov 2006) | 2 lines
2012-11-15 12:53:00 +11:00
Douglas Clowes
2df0200228 Rename files and make more consistent with Beam Monitor code
dio.* => device.*
hdio.* => hware.*
Digital.* => Monitor.*

r1265 | dcl | 2006-11-09 12:25:16 +1100 (Thu, 09 Nov 2006) | 5 lines
2012-11-15 12:52:09 +11:00
Douglas Clowes
9e9a165510 more conversion from counter to DIO
r1264 | dcl | 2006-11-09 11:09:03 +1100 (Thu, 09 Nov 2006) | 2 lines
2012-11-15 12:52:06 +11:00
Douglas Clowes
4b54c82d27 *** empty log message ***
r1263 | dcl | 2006-11-09 11:07:17 +1100 (Thu, 09 Nov 2006) | 2 lines
2012-11-15 12:52:04 +11:00
Douglas Clowes
f690e1d185 reporting only on specific device
r1262 | dcl | 2006-11-09 11:06:34 +1100 (Thu, 09 Nov 2006) | 2 lines
2012-11-15 12:52:01 +11:00
Douglas Clowes
f6e85f1859 event reporting format change and make report only specific device
r1261 | dcl | 2006-11-09 11:04:10 +1100 (Thu, 09 Nov 2006) | 2 lines
2012-11-15 12:51:58 +11:00
Douglas Clowes
19fa04ab39 renamed to be consistent with digital input driver
r1203 | dcl | 2006-10-30 12:22:45 +1100 (Mon, 30 Oct 2006) | 2 lines
2012-11-15 12:49:55 +11:00
Douglas Clowes
f9e7f699d0 renamed from hctr.[hc] to be consistent with digital input driver
r1202 | dcl | 2006-10-30 12:21:49 +1100 (Mon, 30 Oct 2006) | 2 lines
2012-11-15 12:49:53 +11:00
Douglas Clowes
3cc661a970 renamed from cntr.[hc] tp be consistent with digital input driver
r1201 | dcl | 2006-10-30 12:21:01 +1100 (Mon, 30 Oct 2006) | 2 lines
2012-11-15 12:49:51 +11:00
Douglas Clowes
51ff5a056d detect if NIDAQmx is installed
r1200 | dcl | 2006-10-30 12:19:21 +1100 (Mon, 30 Oct 2006) | 2 lines
2012-11-15 12:49:48 +11:00
Douglas Clowes
4623b25ccd Progressive refinement
r1199 | dcl | 2006-10-26 18:38:34 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:46 +11:00
Douglas Clowes
7dfa37057b Refinement alongside Digital
r1198 | dcl | 2006-10-26 18:38:13 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:43 +11:00
Douglas Clowes
4f6054af3a Integrate Register Level Programming and add counter source selection
r1196 | dcl | 2006-10-26 13:09:31 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:39 +11:00
Douglas Clowes
2ab57e1eb2 Make C++ compiler friendly and handle all eight counters in one process.
r1171 | dcl | 2006-10-24 15:44:25 +1000 (Tue, 24 Oct 2006) | 2 lines
2012-11-15 12:48:57 +11:00
Douglas Clowes
d643fbef6a ignore periodicity if not given
r1122 | dcl | 2006-10-09 12:22:28 +1000 (Mon, 09 Oct 2006) | 2 lines
2012-11-15 12:47:28 +11:00