Douglas Clowes
33d0280090
Refactor free of command/transaction code to function
2014-08-21 16:14:40 +10:00
Douglas Clowes
0ed0c016ad
Merge branch 'RELEASE-3_1' into RELEASE-3_2
2014-08-20 13:45:59 +10:00
Douglas Clowes
f1f9ee2c01
Add protocol support for the Knauer HPLC pump
2014-08-20 13:35:13 +10:00
Douglas Clowes
5fa021ce88
Move some definitions and add something private
...
definitions from asyncqueue to asyncprotocol to reduce dependency loops
add protocol-private data structure and killer routine
2014-08-20 13:34:15 +10:00
Douglas Clowes
3d475d3598
Change some names for consistency
2014-08-20 13:05:29 +10:00
Douglas Clowes
67c3bc7964
Add hupdateif <path> <value> [<format>] for conditional update of hipadaba
2014-08-19 15:05:51 +10:00
Douglas Clowes
2cb70741b1
Add hupdateif <path> <value> [<format>] for conditional update of hipadaba
2014-08-19 15:05:32 +10:00
Douglas Clowes
3650e68f9a
Regenerate template drivers
2014-08-19 12:04:53 +10:00
Douglas Clowes
44f6b65aef
Merge branch 'RELEASE-3_1' into RELEASE-3_2
...
Conflicts:
sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
2014-08-19 11:46:24 +10:00
Douglas Clowes
a93819572a
Regenerate template drivers
2014-08-19 11:43:45 +10:00
Douglas Clowes
6f5892f07d
Change SCT wrappers to use ip_address and tcp_port
2014-08-19 11:27:43 +10:00
Douglas Clowes
04a87e5ff2
Change IP/PORT to ip_address/tcp_port and add to mkDriver sig
...
This facilitates use in mkDriver hook code
2014-08-19 11:21:45 +10:00
Douglas Clowes
6266bcdad7
Make a sctcontroller with a NULL aqadapter in simulation mode
2014-08-18 14:50:51 +10:00
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
3fae7edced
Experimental changes to Makefile to build better and faster
2014-08-07 16:28:05 +10:00
Douglas Clowes
b95edfbec8
Only run extract_version.sh once
2014-08-07 16:26:19 +10:00
Douglas Clowes
ca553c68e6
export SICS_* and new way to get changed file count
2014-08-07 16:25:38 +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
Douglas Clowes
08f29ef255
Move "Timeout trace" in asyncqueue trace logging
2014-08-06 10:43:02 +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
379f12fdac
SICS-764: An alternative to the PSI capture command which works when capturing the "run" command.
2014-08-06 10:08:11 +10:00
Ferdi Franceschini
fc7771f359
SICS-764: Provide access to the asynnet socket descriptor's write buffer.
...
We need this to implement a "capture" command that doesn't cause SICS to
commit suicide if you capture a "run" command.
NOTE: This is a bit dodgy because we're trusting callers not to modify the write buffer.
2014-08-06 10:08:10 +10:00
Ferdi Franceschini
8a6da09326
Deploy all environment control drivers.
2014-08-06 10:08:10 +10:00
Douglas Clowes
72fcb82a65
Add "Timeout trace" to asyncqueue trace logging
2014-08-06 10:04:45 +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
d8056ae46a
Changes to Makefile for building on 64-bit RHEL
2014-08-05 11:58:24 +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