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
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
Douglas Clowes
b9954651d5
Make getlog commands less flakey
...
getlog {kill,none}
getlog what
getlog list
getlog err,wrn[,...]
2015-03-13 15:16:31 +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
d751146090
Rename mtth to chom for chopper rotation and set nexus groups.
2015-03-12 10:46:13 +11:00
Ferdi Franceschini
fa92f61433
The mchi fwd limit switch is in the wrong place so we need to compensate.
2015-03-12 10:24:54 +11:00
Ferdi Franceschini
6d87ae05cb
Add some configuration files which might be useful later.
2015-03-12 10:21:15 +11:00
Ferdi Franceschini
e89200999f
Inlcude derived parameters when generating motor configuration.
2015-03-11 14:35:47 +11:00
Ferdi Franceschini
3e11532bd0
my encoder limits swapped in Elec Eng spreadsheet.
2015-03-11 14:21:30 +11:00
Ferdi Franceschini
760d5f3067
Corrections made to Emu_motion_control... spreadsheet during testing.
...
Also renamed axes and added reference positions from spreadsheet.
2015-03-11 13:42:30 +11:00
Ferdi Franceschini
a76f5d9143
First implementation of an Emu.
...
TODO: Review motor names.
2015-03-10 14:13:11 +11:00
Ferdi Franceschini
f72e20b120
SICS-128: Added HB1 and HB2 fields to the reactor status.
2015-03-06 12:01:32 +11:00
Ferdi Franceschini
64a47de78c
SICS-128: The reactor status protocol now just searches for a line containing "Power:" and returns it as the reactor status.
2015-03-06 12:01:32 +11:00
Douglas Clowes
386db5d424
Rename and move the Rheometer drivers for Kookaburra
2015-03-05 14:11:54 +11:00
Douglas Clowes
6f8e7b5429
Pull over sct_antonparr_MCR500.tcl from RELEASE-3_1
2015-03-05 14:11:51 +11:00
Douglas Clowes
f269a17ef3
Merge branch 'RELEASE-3_1' into RELEASE-3_2
...
Conflicts:
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
sics/site_ansto/instrument/tas/taipan_configuration.tcl
2015-03-05 13:53:47 +11:00
Ferdi Franceschini
b75e0b5efb
Make sure that the Lt0 command returns an error if the master_chopper_id isn't set.
2015-02-26 10:51:18 +11:00
Ferdi Franceschini
e0626f4b6a
Improve response of t0_chopper_id command by working around the chopsel IO
...
Box communications problems.
2015-02-26 10:49:39 +11:00
Ferdi Franceschini
243dddc9a3
Fix calculation of ap_limit in collimator anticollision code.
2015-02-26 10:47:56 +11:00
Ferdi Franceschini
52ba801f28
Generated new motor configuration after updating the Bilby_motion_control_commissioning_checklist.xls
...
The update includes corrections for samz and sapmot and configures the beam position as the origin
for the slit motors.
The left and down slit motors "sign" parameter has been changed so all slits drive away from the beam.
2015-02-25 09:44:06 +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
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
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
a924b657e0
Generate the TCL from the new Oxford
2015-02-13 10:58:50 +11:00
