Douglas Clowes
|
9ee2252138
|
Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
sics/site_ansto/instrument/dingo/dingo_configuration.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
sics/site_ansto/instrument/sans/quokka_configuration.tcl
|
2015-03-13 15:44:32 +11:00 |
|
Ferdi Franceschini
|
25d73eb17a
|
Bring config INI files up to date with new drivers and fix some errors.
|
2015-03-13 13:09:15 +11:00 |
|
Douglas Clowes
|
e317e4b341
|
Change names from sct_*.tcl to *_sct.tcl in config/deploy files
|
2015-01-22 13:16:09 +11:00 |
|
Ferdi Franceschini
|
2ebefc2b29
|
SICS-796: Bring GIT up to date with changes made on ics1-dingo.
|
2014-10-08 20:46:16 +11:00 |
|
Ferdi Franceschini
|
cca9029270
|
Enable plc on Dingo
|
2014-09-19 12:17:38 +10:00 |
|
Douglas Clowes
|
c608e5e641
|
Merge changes from Dingo 2014-09-09
|
2014-09-09 16:38:44 +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 |
|
Douglas Clowes
|
f6dfc76ada
|
Pull back changes from Dingo
|
2014-07-09 15:01:21 +10:00 |
|
Douglas Clowes
|
92d3acb5d5
|
Remove superfluous trailing white space from TCL files
|
2014-05-16 17:23:58 +10:00 |
|
Ferdi Franceschini
|
4f44b746ba
|
Provide dummy histogram initialisation function.
|
2013-06-14 09:42:57 +10:00 |
|
Ferdi Franceschini
|
2d8d4864ef
|
Merge branch 'dingo' into merge-replace
|
2013-06-11 08:30:24 +10:00 |
|
Jing Chen
|
fb7685ff8d
|
Integrate Dingo Camera Server Stuffs
|
2013-05-22 10:56:01 +10:00 |
|
Ferdi Franceschini
|
16e744be12
|
Moved MakeDrive to instrument specific configuration.
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
|
2013-04-09 14:15:55 +10:00 |
|
Jing Chen
|
f6cb6602b1
|
re-produce package for Dingo
r3596 | jgn | 2012-06-06 12:01:42 +1000 (Wed, 06 Jun 2012) | 1 line
|
2012-11-15 17:30:25 +11:00 |
|
Jing Chen
|
06ab0664eb
|
r3595 | jgn | 2012-06-06 11:30:16 +1000 (Wed, 06 Jun 2012) | 1 line
|
2012-11-15 17:30:20 +11:00 |
|
Jing Chen
|
66aa3f943c
|
create initial SICS file for Dingo
r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
|
2012-11-15 17:29:19 +11:00 |
|