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
|
8a6da09326
|
Deploy all environment control drivers.
|
2014-08-06 10:08:10 +10:00 |
|
Douglas Clowes
|
972e3232cd
|
Change the names in all of the files
|
2014-07-23 17:30:44 +10:00 |
|
Ferdi Franceschini
|
0ae4d40470
|
Deploy all environment drivers to all instruments.
|
2014-05-16 13:56:51 +10:00 |
|
Ferdi Franceschini
|
bea943ddf2
|
Add new reactor status object to instruments.
|
2014-03-25 09:23:57 +11:00 |
|
Douglas Clowes
|
f3e2a6cd7f
|
Add LS340 to Pelican deployment
|
2013-08-30 14:16:19 +10:00 |
|
Jing Chen
|
a3214236a8
|
add ls218 controller
r3761 | jgn | 2012-10-09 13:38:21 +1100 (Tue, 09 Oct 2012) | 1 line
|
2012-11-15 17:40:06 +11:00 |
|
Jing Chen
|
5af594c967
|
setup pelican config
r3270 | jgn | 2011-11-18 15:44:54 +1100 (Fri, 18 Nov 2011) | 1 line
|
2012-11-15 17:17:35 +11:00 |
|
Jing Chen
|
22b22ffa25
|
add Pelican
r3108 | jgn | 2011-04-20 12:29:55 +1000 (Wed, 20 Apr 2011) | 1 line
|
2012-11-15 17:10:56 +11:00 |
|