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

18
site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.17 $ # $Revision: 1.18 $
# $Date: 2007-07-22 05:23:40 $ # $Date: 2007-08-16 06:38:45 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
@@ -7,11 +7,6 @@
set animal platypus set animal platypus
set sim_mode [SplitReply [motor_simulation]] 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. # Setup addresses of Galil DMC2280 controllers.
set dmc2280_controller1(host) mc1-$animal 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(host) mc4-$animal
set dmc2280_controller4(port) pmc4-$animal set dmc2280_controller4(port) pmc4-$animal
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 mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port) MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port) MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port) MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
}
#Measured absolute encoder reading at home position #Measured absolute encoder reading at home position
@@ -214,7 +214,7 @@ Motor bz $motor_driver_type [params \
absEncHome $bz_home\ absEncHome $bz_home\
cntsPerX [expr -8192.0/6.0]] cntsPerX [expr -8192.0/6.0]]
bz part detector bz part detector
bz long_name shade bz long_name shade_vertical_translation
bz softlowerlim 0 bz softlowerlim 0
bz softupperlim 275 bz softupperlim 275
bz home 0 bz home 0
@@ -465,7 +465,7 @@ Motor dz $motor_driver_type [params \
absEncHome $dz_home\ absEncHome $dz_home\
cntsPerX [expr -8192.0/5.0]] cntsPerX [expr -8192.0/5.0]]
dz part detector dz part detector
dz long_name detector dz long_name vertical_translation
dz softlowerlim 0 dz softlowerlim 0
dz softupperlim 1351 dz softupperlim 1351
dz home 0 dz home 0

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

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

16
site_ansto/instrument/sans/config/motors/motor_configuration.tcl
View File

@@ -1,17 +1,12 @@
# $Revision: 1.4 $ # $Revision: 1.5 $
# $Date: 2007-08-10 00:34:32 $ # $Date: 2007-08-16 06:40:00 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $ # Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION # START MOTOR CONFIGURATION
set animal quokka set animal quokka
set sim_mode [SplitReply [motor_simulation]] 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. # Setup addresses of Galil DMC2280 controllers.
set dmc2280_controller1(host) mc1-$animal 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(host) mc4-$animal
set dmc2280_controller4(port) pmc4-$animal set dmc2280_controller4(port) pmc4-$animal
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 mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port) MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port) MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port) MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
}
#Measured absolute encoder reading at home position #Measured absolute encoder reading at home position