Commit Graph

35 Commits

Author SHA1 Message Date
Jing Chen
aa860a120b r3334 | jgn | 2012-01-09 09:17:54 +1100 (Mon, 09 Jan 2012) | 1 line 2012-11-15 17:22:19 +11:00
Douglas Clowes
5143937f00 Adjustment to accomodate "make incflags" correctly
r3272 | dcl | 2011-11-24 09:34:46 +1100 (Thu, 24 Nov 2011) | 1 line
2012-11-15 17:17:44 +11:00
Douglas Clowes
27cb364855 Use libjson.so if available (SL 6.0)
r3258 | dcl | 2011-10-17 17:22:27 +1100 (Mon, 17 Oct 2011) | 1 line
2012-11-15 17:16:43 +11:00
Jing Chen
1fa3d21486 add Pelican
r3107 | jgn | 2011-04-20 12:10:04 +1000 (Wed, 20 Apr 2011) | 1 line
2012-11-15 17:10:50 +11:00
Douglas Clowes
7f4b0de463 Modify makefiles to find libraries on more platforms
r3060 | dcl | 2011-02-18 11:04:57 +1100 (Fri, 18 Feb 2011) | 1 line
2012-11-15 17:07:57 +11:00
Jing Chen
fb70b8af0b added Lyrebird instrument
r3039 | jgn | 2010-12-13 16:32:54 +1100 (Mon, 13 Dec 2010) | 1 line
2012-11-15 17:07:06 +11:00
Douglas Clowes
86b9e56b6e remove .obj in psi for clean
r3014 | dcl | 2010-08-06 15:05:33 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:39 +11:00
Ferdi Franceschini
d2f57e4615 SICS-294 anstohttp.c
Histmem now only calls TaskYield after SICS has finished initalising, this stops the statusfile task from being called early and overwriting the status file. Created ANSTO_MakeHistMemory command to install ANSTO_HistAction
Added veto functions.  Mapped the HistDriver interface Pause() and Continue() commands to AnstoHttpVeto and AnstoHttpNoVeto. Implemented an ANSTO_Histaction to call AnstoHttpPause when sent a "pause" subcommand.

hmcontrol_ansto.c
Call AnstoHttpPause() directly when Pause_HM_After_Count is set to preserver current behaviour.

counterdriv.c
Now sends the correct "SICS RESUME" command to resume a paused count.

ansto_sctdriveadapter.c NEW
This lets you create driveable objects from script-context controllers which have one node for setting a parameter and another node for reading the parameter (eg temperature controllers, choppers, velocity selectors)

sctemonadapter.c NEW
This generates an environment monitor interface for script-context controllers so that the emon object in SICS will be able to pause counters if the controller goes out of tolerance.

sct_usbtmcprot.c, usbtmc.h NEW
First attempt at a protocol handler for USB Test and Measurement Class devices

sct_julabo_lh45.tcl NEW
Implements script-context controller for the Julabo LH45 temperature controller.

Makefile
Added ansto_sctdriveadapter and sctemonadapter

hardsup/makefile
Added velocity selector and usbtmc protocol handlers

hardsup/sct_velselprot.c
Simplified, don't worry about trying to implement a login handler for now, just implement a "Reading" handler.

site_ansto.c
Add the velocity selector and USBTMC protocol handlers.
Added the ANSTO_MakeHM command

instrument/config/hipadaba/common_instrument_dictionary.tcl
Added support for auxiliary data, ie extra meta-data entries in the "data" group of the nexus file.
Add new NXvelocity_selector object under /instrument.

instrument/config/hipadaba/hipadaba_configuration_common.tcl
Add the new "sct_object" script-context controller objects to the hdb tree.

instrument/config/hipadaba/instdict_specification.tcl
Define the new sct_object controllers.

instrument/config/hmm/hmm_configuration_common_1.tcl
Use the new ANSTO_MakeHM command to create histmem drivers which support veto.
Define allowed attributes and elements for the BAT_TABLE and FAT_TABLE
Stop between counts instead of pausing because setting pause now sends a veto.

instrument/config/motors/sct_jogmotor_common.tcl
You now need to specify klass when creating a jogmotor.

instrument/config/motors/sct_positmotor_common.tcl
You can now specify an optional function which calculates the instrument parameter (eg attenuation) from a posit table entry when defining a posit motor.

instrument/config/nexus/nxscripts_common_1.tcl
Report file status info in the /experiment section of the hdb tree.  Add auxiliary data to data file.
Handle saving data from script-context controller objects.

instrument/util/script_context_util.tcl
Added procedure to set required properties  for saving script-context object data.

instrument/util/utility.tcl
Added set_sct_object_attributes proc to automatically set required attributes on SCT_OBJECTs
Fixed hlistplainprop to deal with empty property fields on hdb nodes.

instrument/server_config.tcl
Call the new nexus initialisation command and set attributes on sct objects.

hrpd/config/motors/motor_configuration.tcl
New absenc home readings for mchi and mphi. New absenc home and range for mf1

hipd/config/commands/commands.tcl
Exported and published the new ajscmds so that they can be used in batch files.

hipd/config/motors/motor_configuration.tcl
New mchi absenc home

rsd/config/hmm/hmm_configuration.tcl
Provide support for saving corrected hmm data

rsd/config/motors/motor_configuration.tcl
Use simple names for motors.

SICS-329

sans/config/INSTCFCOMMON.TXT
Added julabo and lakeshore configuration files to list.

sans/config/optics/guide_configuration.tcl
Added entrance aperture positions to the configuration table and the cn_maps which map the index to the component ID.

sans/commands/commands.tcl
The "guide" command now set EApPosYmm after driving the guides in place.
The indexed position to component maps (cn_map) have been moved to the guide_configuration.tcl file.

sans/motors/motor_configuration.tcl
Set samy home to 56.1mm

sans/config/velsel/sct_velsel.tc NEW
Implements script-context controller object for the NVS40 velocity selector. TODO tilt-angle control, driveable interface.

sans/config/hmm/hmm_configuration.tcl
Set 5.08mm spacing on detector width. Use pixel-offset for vertical and horizontal detector axes.

sans/config/motors/motor_configuration.tcl
Swap directions of beamstops 4 and 5 (the two smallest)
New config parameters for samx, samthet, apx, det, detoff, bsz,

sans/config/motors/positmotor_configuration.tcl
Added descriptive headers to positmotor configuration tables and new synstax for the make positmotor command.

sans/config/nexus/nxscripts.tcl
Implemented initialisation command.

sans/config/parameters/parameters.tcl
Added SampleThickness and TransmissionFlag.  Calculate SamplePosYmm from samy and SamyOffsetmm.
Added beamstops to hdb tree.

reflectometer/config/nexus/nxscripts.tcl
Implement the initialisation procedure.

r2767 | ffr | 2009-03-31 10:16:54 +1100 (Tue, 31 Mar 2009) | 123 lines
2012-11-15 16:57:04 +11:00
Ferdi Franceschini
4d740d11e8 Set the DO_NOT_SELECT_BEFORE_SEND macro def for network.c
This stops GumTree from killing SICS when it exits.

r2733 | ffr | 2008-11-04 16:02:43 +1100 (Tue, 04 Nov 2008) | 3 lines
2012-11-15 16:56:26 +11:00
Ferdi Franceschini
8a07f5eaf6 SICS-188 hdb_path is now a comma separated list of paths. NOTE: nodes listed as derived parameter dependencies aren't added to the path.
sans/config/hmm/detector.tcl
Use dns-name for voltage controller address.

sans/config/motors/motor_configuration.tcl
Set det home position.
SICS-122 Added FastShutter variable and configured det motor with an action object to set the FastShutter variable.
SICS-248 Replaced beamstop motor objects with beamstop action objects.

action.[ch]
The action object factory will eventuall be defined here.
SICS-122 Currently there is just a funcion which sets the FastShutter variable

beamstopaction.c
Added motion control enabled check.
Added "list" subcommand.

Makefile
Compile action.c

motor_dmc2280.c
The status check command now always checks the TI1 and TI0 interrupts.
Added action-object configuration parameter.  Call AO_istatus with TI1
if configured with an action object.

r2674 | ffr | 2008-08-13 14:16:30 +1000 (Wed, 13 Aug 2008) | 26 lines
2012-11-15 13:41:01 +11:00
Ferdi Franceschini
d7cea6914c oscillate.c SICS-232
You can now run the oscillating collimator for a specified number of cycles.
A MOTEND event is now sent when the oscillator stops.
Also temporarily set status to eEager to allow changing the motor accesscode parameter while something else is running, (eg a counter)

motor.c
finishDriving is no longer static so we can call it from the oscilator and generate a MOTEND event.

west4100.c
Return 'success' from wrapper on "controlsensor" and "sensorlist" queries so we can test and capture their values in scripts.

Makefile
Compile the quokka beamstopaction object

site_ansto.c
Add the MakeActionObject command.  Currently only makes the hardcoded beamstopaction object

obpar.c
Report object name and parameter on an illegal attempt to set a parameter

hmm_configuration_common_1.tcl
Add oscillating collimator control flag for Wombat.  If true we use hmm to start the histogram server instead of hmc.  TODO remove hmc and always use hmm.

hipd/config/motors/motor_configuration.tcl
Don't load anticollider config twice.  Fix oct limits

wombat_configuration.tcl
Environment configuration must be loaded before running server_init.

hrpd/config/hmm/hmm_configuration.tcl
Fix default time-bin to match 10Hz frame frequency

hrpd/config/motors/motor_configuration.tcl
Added dummy motor for testing.

reflectometer/config/hmm/detector.tcl
Fill in dhv1 configuration parameters.

sans/config/hmm/detector.tcl
Enable detector voltage control

sans/config/hmm/hmm_configuration.tcl
SICS-227 set default resolution to 192x192

sans/config/motors/motor_configuration.tcl
Added dummy motor for testing

quokka parameters.tcl
Fix L2mm calculation, Fix SICS-228 users cannot set rotapdeg

beamstopaction.[ch]
NEW: Implements an action command to drive the quokka beamstops up and down.

r2670 | ffr | 2008-08-07 13:17:29 +1000 (Thu, 07 Aug 2008) | 53 lines
2012-11-15 13:40:44 +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
cf5d570a52 update nhq driver and add koala instrument
r2588 | dcl | 2008-05-29 14:49:59 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:24 +11:00
Douglas Clowes
63cd8f3ea3 Add compiler option for C99 std
r2524 | dcl | 2008-05-12 11:09:19 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:09 +11:00
Douglas Clowes
b12fff759a add -Wextra -std=gnu99 -Wno-unused compiler flags
r2425 | dcl | 2008-04-14 09:42:15 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:52 +11:00
Douglas Clowes
8bd0037997 Add ORHVPS and FSM
r2275 | dcl | 2008-01-15 12:30:01 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:49 +11:00
Douglas Clowes
9c1a9a37ae Add TAS (taipan)
r2219 | dcl | 2007-11-05 11:46:05 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:18 +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
Douglas Clowes
e36f220d23 Add QUOKKA/SANS to Makefile
r2055 | dcl | 2007-07-12 08:48:39 +1000 (Thu, 12 Jul 2007) | 2 lines
2012-11-15 13:20:41 +11:00
Ferdi Franceschini
a33918149c Bringing kowari layout and config inline with the current requirements of
the deployment script.

r1941 | ffr | 2007-05-07 15:54:09 +1000 (Mon, 07 May 2007) | 3 lines
2012-11-15 13:16:06 +11:00
Douglas Clowes
7efec40cc6 Add section for platypus/reflectometer
r1712 | dcl | 2007-03-23 18:52:36 +1100 (Fri, 23 Mar 2007) | 2 lines
2012-11-15 13:09:51 +11:00
Douglas Clowes
349831f603 Add in the Safety PLC object
r1562 | dcl | 2007-03-01 09:07:44 +1100 (Thu, 01 Mar 2007) | 2 lines
2012-11-15 13:02:29 +11:00
Ferdi Franceschini
30eead7937 Added support to generate sicspoll. and sicsdrive.c files from .tc templates.
r1538 | ffr | 2007-02-22 16:09:06 +1100 (Thu, 22 Feb 2007) | 2 lines
2012-11-15 13:01:20 +11:00
Douglas Clowes
a0440e66f8 Remove -fwritable-strings and add -Wall compiler options
r1508 | dcl | 2007-02-19 12:29:14 +1100 (Mon, 19 Feb 2007) | 2 lines
2012-11-15 12:59:59 +11:00
Ferdi Franceschini
f4a85b93a9 Added wombat target
r1475 | ffr | 2007-02-13 16:17:55 +1100 (Tue, 13 Feb 2007) | 2 lines
2012-11-15 12:58:25 +11:00
Ferdi Franceschini
634f2023b1 Modified during MK's visit.
r1462 | ffr | 2007-02-12 12:06:19 +1100 (Mon, 12 Feb 2007) | 2 lines
2012-11-15 12:57:55 +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
Mark Lesha
8ff8877d1d MJL 8/11/06 Added compile for hmcontrol_ansto.o.
r1259 | mle | 2006-11-08 17:01:21 +1100 (Wed, 08 Nov 2006) | 2 lines
2012-11-15 12:51:53 +11:00
Ferdi Franceschini
9cc4126401 Added json support
r1193 | ffr | 2006-10-26 11:05:23 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:31 +11:00
Mark Lesha
98e5ce4673 MJL 11/10/06 added Histogram Server HTTP support
r1132 | mle | 2006-10-11 14:11:13 +1000 (Wed, 11 Oct 2006) | 2 lines
2012-11-15 12:47:52 +11:00
Ferdi Franceschini
480d14dbe4 Added nexus xml support.
r1123 | ffr | 2006-10-09 12:50:43 +1000 (Mon, 09 Oct 2006) | 2 lines
2012-11-15 12:47:31 +11:00
Ferdi Franceschini
a7ebdff308 Created anstoutil to share the getParam function.
Modified motor_dmc2280 and counterdiv to use anstoutil

r1033 | ffr | 2006-07-25 16:48:14 +1000 (Tue, 25 Jul 2006) | 3 lines
2012-11-15 12:45:13 +11:00
Ferdi Franceschini
cb5b6e704e Added incflags target, this is useful for running code checkers like splint.
r1024 | ffr | 2006-06-22 09:22:41 +1000 (Thu, 22 Jun 2006) | 2 lines
2012-11-15 12:44:57 +11:00
Ferdi Franceschini
ace9b91a96 Make sure that default is 'make all'
r987 | ffr | 2006-05-09 13:55:29 +1000 (Tue, 09 May 2006) | 2 lines
2012-11-15 12:44:15 +11:00
Ferdi Franceschini
81359a740f Added to repository.
r986 | ffr | 2006-05-09 09:17:15 +1000 (Tue, 09 May 2006) | 2 lines
2012-11-15 12:44:13 +11:00