Douglas Clowes
|
21c96297f3
|
Merge branch 'Wombat' into RELEASE-3_1
|
2015-04-17 13:17:45 +10:00 |
|
Douglas Clowes
|
f2568b681d
|
Pullback from Wombat 2015-04-17
|
2015-04-17 13:12:42 +10:00 |
|
Douglas Clowes
|
2925bdedc5
|
Merge branch 'Platypus' into RELEASE-3_1
|
2015-04-17 12:52:59 +10:00 |
|
Douglas Clowes
|
843a9f46be
|
Pullback changes from Platypus
|
2015-04-17 12:52:17 +10:00 |
|
Douglas Clowes
|
1a93e494d9
|
Add a test setup for Pelican
|
2015-04-17 12:38:19 +10:00 |
|
Douglas Clowes
|
94663632e4
|
Merge branch 'Quokka' into RELEASE-3_1
Conflicts:
sics/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/sans/quokka_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
|
2015-04-17 12:27:57 +10:00 |
|
Douglas Clowes
|
1f9dd8da95
|
Pullback from Quokka 2015-04-17
|
2015-04-17 12:15:01 +10:00 |
|
Douglas Clowes
|
49a43f4d9b
|
Merge branch 'Taipan_R31' into RELEASE-3_1
|
2015-04-17 11:50:03 +10:00 |
|
Douglas Clowes
|
d07a0418b6
|
Add Taipan euler_config
|
2015-04-17 11:49:10 +10:00 |
|
Douglas Clowes
|
349171e8ec
|
Minor changes from Taipan motor_config
|
2015-04-17 11:45:05 +10:00 |
|
Douglas Clowes
|
65b8f93cea
|
Merge tag 'Taipan_2014-09-19' into Taipan_R31
Deployed to Taipan
Conflicts:
sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/tas/taipan_configuration.tcl
|
2015-04-17 11:36:01 +10:00 |
|
Douglas Clowes
|
c6b9a3ab97
|
Merge branch 'Dingo' into RELEASE-3_1
Conflicts:
sics/site_ansto/instrument/dingo/util/sics_config.ini
|
2015-04-17 10:57:32 +10:00 |
|
Douglas Clowes
|
fea223beff
|
Add motor soma to dingo configuration
|
2015-04-17 10:48:20 +10:00 |
|
Douglas Clowes
|
6ef97197ee
|
Handle nested GROUP and VAR constructs in gen_sct.py
|
2015-03-13 15:31:56 +11:00 |
|
Douglas Clowes
|
125ebc9f6d
|
Make getlog commands less flakey
getlog {kill,none}
getlog what
getlog list
getlog err,wrn[,...]
|
2015-03-13 15:31:56 +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 |
|
Ferdi Franceschini
|
88c1f007fa
|
Fix up whitespace.
|
2015-03-13 11:57:56 +11:00 |
|
Ferdi Franceschini
|
e7e2e87b83
|
Copy changes from ics1-wombat
|
2015-03-13 11:54:50 +11:00 |
|
Ferdi Franceschini
|
445a8c2fce
|
Fix eulerian spelling.
|
2015-02-23 10:22:29 +11:00 |
|
Ferdi Franceschini
|
a974be9c86
|
SICS-844 Add eulerian cradle configuration to Taipan
|
2015-02-23 10:22:28 +11:00 |
|
Douglas Clowes
|
06c51416dd
|
Merge branch 'Dingo' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/server_config.tcl
|
2015-02-19 16:04:50 +11:00 |
|
Douglas Clowes
|
27c3a48d91
|
Pullback from Dingo 2015-02-19
|
2015-02-19 15:59:22 +11:00 |
|
Douglas Clowes
|
92539b80aa
|
Merge branch 'Kookaburra' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/kookaburra/config/anticollider/acscript.txt
|
2015-02-19 15:54:22 +11:00 |
|
Douglas Clowes
|
0cff1f7c3c
|
Pullback from Kookaburra 2015-02-19
|
2015-02-19 15:51:41 +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
|
4e383b2af2
|
Merge branch 'Echidna' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
|
2015-02-19 14:57:43 +11:00 |
|
Douglas Clowes
|
4756be739a
|
Merge branch 'Platypus' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/sct_omron_hldc.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
|
2015-02-19 14:55:19 +11:00 |
|
Douglas Clowes
|
1bb7f90237
|
Merge branch 'Pelican' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
|
2015-02-19 14:53:33 +11:00 |
|
Douglas Clowes
|
106d61a883
|
Merge branch 'Taipan_R31' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/tas/taipan_configuration.tcl
sics/site_ansto/instrument/tas/util/sics_config.ini
|
2015-02-19 14:50:39 +11:00 |
|
Douglas Clowes
|
14be249401
|
Pullback from Wombat 2015-02-19
|
2015-02-19 11:51:51 +11:00 |
|
Douglas Clowes
|
31420ab850
|
Pullback from Echidna 2015-02-19
|
2015-02-19 11:43:50 +11:00 |
|
Douglas Clowes
|
da2383f5ce
|
Pullback from Platypus 2015-02-19
|
2015-02-19 11:30:48 +11:00 |
|
Douglas Clowes
|
40d2a1e2f4
|
Pullback from Pelican 2015-02-19
|
2015-02-19 11:24:44 +11:00 |
|
Douglas Clowes
|
2dcf274618
|
Tilt configuration from Taipan 2015-02-19
|
2015-02-19 10:35:21 +11:00 |
|
Douglas Clowes
|
666a70cb96
|
Dubious diffs from Taipan 2015-02-19
|
2015-02-19 10:34:31 +11:00 |
|
Douglas Clowes
|
fbdd46e258
|
Pullback from Taipan 2015-02-19
|
2015-02-19 10:34:12 +11:00 |
|
Douglas Clowes
|
a5498a2a77
|
Pull some changes from RELEASE-3_1 in gen_sct and *.sct
|
2015-02-19 09:48:38 +11:00 |
|
Douglas Clowes
|
8c4eed9bfe
|
Merged changes from Quokka as at 2015-02-18
|
2015-02-19 09:40:49 +11:00 |
|
Douglas Clowes
|
287b671569
|
Regenerate for limit changes
|
2015-02-19 09:14:23 +11:00 |
|
Douglas Clowes
|
45d4663816
|
Pullback limit adjustments from Quokka to sct template drivers
|
2015-02-19 09:04:43 +11:00 |
|
Douglas Clowes
|
bf8be461ee
|
Add in from Quokka
|
2015-02-18 14:46:54 +11:00 |
|
Douglas Clowes
|
4619a57eff
|
Pullback from Quokka 2015-02-18
|
2015-02-18 14:14:11 +11:00 |
|
Douglas Clowes
|
648c7bf1dd
|
Update Quokka configuration file
|
2015-02-18 12:36:11 +11:00 |
|
Douglas Clowes
|
f0bc6f0693
|
Backport the build command from RELEASE-3_2
|
2015-02-18 11:54:08 +11:00 |
|
Douglas Clowes
|
cad4f64dcc
|
Regenerate the 3He driver for the coils
|
2015-02-16 12:38:43 +11:00 |
|
Douglas Clowes
|
f80bec1403
|
Changes to get and set the field coil values
|
2015-02-16 12:38:02 +11:00 |
|
Douglas Clowes
|
22bb612296
|
Fake device for Oxford LabView testing
|
2015-02-16 12:36:12 +11:00 |
|
Douglas Clowes
|
3486b75d47
|
Generate the TCL from the new Oxford
|
2015-02-13 10:57:58 +11:00 |
|
Douglas Clowes
|
2993a04485
|
Alternative Oxford Magnet Labview interface
|
2015-02-13 10:56:50 +11:00 |
|
Douglas Clowes
|
be0d932a21
|
SICS-846 Off by one error in argc check sct_asyncqueue.c
|
2015-01-23 17:13:50 +11:00 |
|