Ferdi Franceschini
e7e2e87b83
Copy changes from ics1-wombat
2015-03-13 11:54:50 +11:00
Douglas Clowes
8b4ab411fd
Merge branch 'Wombat' into temp
...
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/hipd/config/commands/commands.tcl
sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/hipd/util/sics_config.ini
2015-02-19 15:26:13 +11:00
Douglas Clowes
14be249401
Pullback from Wombat 2015-02-19
2015-02-19 11:51:51 +11:00
Ferdi Franceschini
0becbe914a
Use the sct_pulser sctcontroller generated from the agilent_33220A.sct wrapper.
2014-07-18 15:54:59 +10:00
Douglas Clowes
5b48df31ba
Merge from Quokka hvcommands.tcl and pulser.tcl
2014-06-25 17:08:53 +10:00
Douglas Clowes
ccc47a4c57
Pull in Wombat changes to hvcommands.tcl
2014-06-25 13:20:20 +10:00
Douglas Clowes
92d3acb5d5
Remove superfluous trailing white space from TCL files
2014-05-16 17:23:58 +10:00
Ferdi Franceschini
2c862d24c6
Added HV pulser commands from Wombat. Made some bug fixes and modified
...
commands to provide feedback when setting a parameter because the
sctcontroller expects feedback from all commands.
r3352 | ffr | 2012-01-27 13:57:19 +1100 (Fri, 27 Jan 2012) | 4 lines
2012-11-15 17:23:40 +11:00