linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't MakeAsyncQueue when using simulated driver.

Browse Source 
r2124 | ffr | 2007-08-16 16:40:00 +1000 (Thu, 16 Aug 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-08-16 16:40:00 +10:00
committed by Douglas Clowes
parent 950037bfc3
commit 2b2ec38ceb
3 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.11 $
# $Date: 2007-07-22 05:58:52 $
# $Revision: 1.12 $
# $Date: 2007-08-16 06:39:17 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -7,11 +7,6 @@
set animal kowari
set sim_mode [SplitReply [motor_simulation]]
if {$sim_mode == "true"} {
set motor_driver_type asim
} else {
set motor_driver_type DMC2280
}
# Setup addresses of Galil DMC2280 controllers.
set dmc2280_controller1(host) mc1-$animal
@@ -26,10 +21,15 @@ set dmc2280_controller3(port) pmc3-$animal
set dmc2280_controller4(host) mc4-$animal
set dmc2280_controller4(port) pmc4-$animal
MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
if {$sim_mode == "true"} {
set motor_driver_type asim
} else {
set motor_driver_type DMC2280
MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
}
#Measured absolute encoder reading at home position
# 7830128, 7493025, 7431942, 7891548, 28473828, 11307802, 0, 0
@@ -447,7 +447,7 @@ Motor psw $motor_driver_type [params \
stepsPerX -20125\
motorHome 2040518]
psw part aperture.primary
psw part long_name width
psw long_name width
setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
## Primary Slit, height, 0-30mm
@@ -541,6 +541,9 @@ publish mthGet user
MakeConfigurableMotor mth
mth readscript mthGet
mth drivescript mthSet
sicslist setatt mth klass crystal
sicslist setatt mth units degrees
sicslist setatt mth long_name half_takeoff_angle
proc sthGet {} { return [expr [SplitReply [stth]]/2.0]}
proc sthSet {val} { return "stth=[SplitReply [stth]]"}
@@ -549,6 +552,9 @@ publish sthSet user
MakeConfigurableMotor sth
sth readscript sthGet
sth drivescript sthSet
sicslist setatt sth klass sample
sicslist setatt sth units degrees
sicslist setatt sth long_name half_azimuthal_angle
#--------------------------------------------------------