Commit Graph

1860 Commits

Author SHA1 Message Date
Douglas Clowes
10b7e8029f Merge branch 'RELEASE-3_1' into RELEASE-3_2 2014-08-18 13:34:56 +10:00
Douglas Clowes
288be8f1c2 Generate the green magnet wrapper TCL code 2014-08-18 12:48:01 +10:00
Douglas Clowes
273c26cc22 Add a wrapper for the green magnet 2014-08-18 12:46:48 +10:00
Douglas Clowes
6f5f2b69cf Make Agilent use mkWrapper 2014-08-18 12:42:35 +10:00
Douglas Clowes
2c8f1131f6 Add wrapper_property nosctcontroller = <anything> to gen_sct 2014-08-18 12:34:24 +10:00
Douglas Clowes
ea9de2c617 Add @TCL/@END code to gen_sct 2014-08-18 11:39:24 +10:00
Douglas Clowes
da17516491 Add wrapper_property and mkWrapper code for SCT wrappers 2014-08-18 11:39:17 +10:00
Douglas Clowes
8541f7cd90 Remove extra makesctcontroller from Agilent 2014-08-15 12:21:36 +10:00
Ferdi Franceschini
13003126a6 Use configured magnet name in OxfordSet commands.
Also T3 is really pressure.
2014-08-08 11:52:04 +10:00
Ferdi Franceschini
944902c9d4 Added sct wrapper to load legacy sct_oxford_labview.tcl driver. 2014-08-08 11:51:49 +10:00
Douglas Clowes
c95d2d6885 Add temperature subdirectory to lakeshore 218 and m370 fileeval 2014-08-08 09:45:30 +10:00
Douglas Clowes
bd4dfdee79 Remove _trial_temp* directories and *.orig files from TARDIR 2014-08-07 09:43:26 +10:00
Douglas Clowes
d398c57a05 Remove _trial_temp* directories and *.orig files from TARDIR 2014-08-07 09:42:47 +10:00
Douglas Clowes
3c53392b34 Regenerate bilby's astrium_chopper SCT driver 2014-08-06 13:54:28 +10:00
Douglas Clowes
507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2014-08-06 13:53:18 +10:00
Ferdi Franceschini
639e4dc3c8 Generated sct tcl drivers from sct templates. 2014-08-06 11:20:46 +10:00
Ferdi Franceschini
18c862a609 Adding config INI file to Pelican. 2014-08-06 11:20:45 +10:00
Ferdi Franceschini
bf355fb9ed Load all kinds of environment for Pelican and Wombat because we should be
able to just add a new device to the sics_config.ini and load it.
2014-08-06 10:08:12 +10:00
Ferdi Franceschini
2c753a3f18 Make sample stages configurable and add Oxford magnet sample stick motor as an option. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
7b6b11eef2 Let everyone have a magnet sample stick motor. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
6b8d9d88fa The default interval of five seconds seems to be working for everyone so let it be. 2014-08-06 10:08:11 +10:00
Ferdi Franceschini
8a6da09326 Deploy all environment control drivers. 2014-08-06 10:08:10 +10:00
Douglas Clowes
c86ff4c883 Prettyfy the dump routines 2014-08-05 17:45:30 +10:00
Douglas Clowes
973f844186 Allow Group_Property override for klass and type and set topleve data true 2014-08-05 17:07:02 +10:00
Douglas Clowes
a1f509d96a Force branch klass to '@none' and type to 'part' 2014-08-05 16:45:42 +10:00
Douglas Clowes
5fb4bc9adc If data is true default klass to parameter in SCT 2014-08-05 16:38:41 +10:00
Douglas Clowes
5be03cc63b make default mutable 'true' and data on branches 2014-08-05 16:04:55 +10:00
Douglas Clowes
a761136b48 Regenerate modified drivers 2014-08-05 12:23:33 +10:00
Douglas Clowes
d330d7874a Add the FOPDT and PID modules
The First Order Plus Delay Time module is a model of a
controlled system that is useful in modelling and
simulating process control systems.

The Proportional Integral Differential module is a control
system that is useful in controlling process control
systems.

This is not fully functional yet.
2014-08-05 11:44:27 +10:00
Douglas Clowes
17315b15c7 Remove hand-coded config for generated in Oxford ITC-500 2014-08-04 15:46:16 +10:00
Douglas Clowes
39519d8c1c Don't register poll/write when simulating in LS-3xx drivers 2014-08-04 15:45:59 +10:00
Douglas Clowes
5112af83fd SICS-697 Decorate LS-370 with permlink 2014-08-04 15:42:08 +10:00
Ferdi Franceschini
94beedd885 We need dingo.hdd for the scan command. NOTE SICS crashes without it, see SICS-763 2014-08-01 11:35:09 +10:00
Ferdi Franceschini
e16e192d01 Use the camera driver auxiliary command cm1_cmd to set motor position meta data. 2014-07-31 15:48:30 +10:00
Douglas Clowes
05dc1958ff SICS-696 Explicity include the namespace on mk_sct_ calls 2014-07-31 11:36:22 +10:00
Ferdi Franceschini
9b965e6313 Minimal scan.tcl and dingo_configuration.tcl
FIX: The scan fails to update the motor positions in the camera server meta data.
2014-07-28 10:10:18 +10:00
Ferdi Franceschini
a7039c5ca0 Don't abort server_init if one of the initialisation commands fails. 2014-07-28 10:02:49 +10:00
Ferdi Franceschini
a24afd1298 Modify test configuration for testing on Dingo.
The dingo_configuration.tcl could be based on this.
TODO: Move scan configuration to scan.tcl
2014-07-24 13:57:15 +10:00
Ferdi Franceschini
a62a284372 Define Echidna sics_config.ini with configurable sample stage. 2014-07-24 13:53:33 +10:00
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Douglas Clowes
9c90153f37 Perform the rename 2014-07-23 17:14:18 +10:00
Douglas Clowes
e04785f3a8 Code to generate the move/rename 2014-07-23 17:14:13 +10:00
Douglas Clowes
dda4a0f8f6 Fix erroneous filenames that match other files 2014-07-23 16:20:34 +10:00
Douglas Clowes
dedcc49284 Fix erroneous filenames that match other files 2014-07-23 16:20:22 +10:00
Douglas Clowes
e3b583150e SICS-696 Explicity include the namespace on mk_sct_ calls 2014-07-23 14:32:26 +10:00
Douglas Clowes
16b435befe Fix an unbalanced brace 2014-07-23 14:27:50 +10:00
Douglas Clowes
8d4366fa95 Change newserver to a link to server_date_time in deploySICS 2014-07-21 15:50:43 +10:00
Douglas Clowes
001d41a703 Change newserver to a link to server_date_time in deploySICS 2014-07-21 15:34:18 +10:00
Douglas Clowes
ab3d7c5adf Remove explicit test debug_threshold from SCT files and regenerate 2014-07-21 10:58:01 +10:00
Ferdi Franceschini
b9f67a2562 Fix saving t0_chopper_freq and tof length values. 2014-07-20 21:42:36 +10:00