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
This commit is contained in:
Douglas Clowes
2014-08-06 13:53:18 +10:00
80 changed files with 2274 additions and 819 deletions

View File

@@ -0,0 +1,18 @@
Motor $magmot $motor_driver_type [params \
asyncqueue $magmot_aq\
axis $magmot_axis\
units degrees\
hardlowerlim -1440\
hardupperlim 1440\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX [expr 67.0 * 25000 / 360]\
absEnc 1\
absEncHome 31275743\
cntsPerX [expr 67.0 * 8192 / 360]]
$magmot part sample
$magmot long_name $magmot
$magmot softlowerlim -180
$magmot softupperlim 180
$magmot home 0