diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl index e0930e70..60359224 100644 --- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl @@ -1,7 +1,7 @@ -# $Revision: 1.24 $ -# $Date: 2008-05-30 00:26:56 $ +# $Revision: 1.25 $ +# $Date: 2008-06-04 05:21:36 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) -# Last revision by: $Author: ffr $ +# Last revision by: $Author: dcl $ source $cfPath(anticollider)/anticollider.tcl # START MOTOR CONFIGURATION @@ -119,8 +119,8 @@ Motor mphi $motor_driver_type [params \ asyncqueue mc1\ axis A\ units degrees\ - hardlowerlim -15\ - hardupperlim 15\ + hardlowerlim -2\ + hardupperlim 2\ maxSpeed 1\ maxAccel 1\ maxDecel 1\ @@ -128,7 +128,7 @@ Motor mphi $motor_driver_type [params \ absEnc 1\ absEncHome $mphi_Home\ cntsPerX -8192] -setHomeandRange -motor mphi -home 0 -lowrange 15 -uprange 15 +setHomeandRange -motor mphi -home 0 -lowrange 2 -uprange 2 mphi speed 1 mphi movecount $move_count mphi precision 0.05 @@ -140,8 +140,8 @@ Motor mchi $motor_driver_type [params \ asyncqueue mc1\ axis B\ units degrees\ - hardlowerlim 75\ - hardupperlim 105\ + hardlowerlim 88\ + hardupperlim 92\ maxSpeed 1\ maxAccel 1\ maxDecel 1\ @@ -149,7 +149,7 @@ Motor mchi $motor_driver_type [params \ absEnc 1\ absEncHome $mchi_Home\ cntsPerX 8192] -setHomeandRange -motor mchi -home 90 -lowrange 15 -uprange 15 +setHomeandRange -motor mchi -home 90 -lowrange 2 -uprange 2 mchi speed 1 mchi movecount $move_count mchi precision 0.01 @@ -183,7 +183,7 @@ Motor mx $motor_driver_type [params \ axis D\ units mm\ hardlowerlim -15\ - hardupperlim 12\ + hardupperlim 15\ maxSpeed 1\ maxAccel 1\ maxDecel 1\ @@ -191,7 +191,7 @@ Motor mx $motor_driver_type [params \ absEnc 1\ absEncHome $mx_Home\ cntsPerX -8192] -setHomeandRange -motor mx -home 0 -lowrange 15 -uprange 12 +setHomeandRange -motor mx -home 0 -lowrange 15 -uprange 15 mx speed 1 mx movecount $move_count mx precision 0.01 @@ -203,8 +203,8 @@ Motor mom $motor_driver_type [params \ asyncqueue mc1\ axis E\ units degrees\ - hardlowerlim -10\ - hardupperlim 150\ + hardlowerlim -1\ + hardupperlim 140\ maxSpeed 1\ maxAccel 1\ maxDecel 1\ @@ -212,7 +212,7 @@ Motor mom $motor_driver_type [params \ absEnc 1\ absEncHome $mom_Home\ cntsPerX -4096] -setHomeandRange -motor mom -home 0 -lowrange 10 -uprange 150 +setHomeandRange -motor mom -home 0 -lowrange 1 -uprange 140 mom speed 1 mom movecount $move_count mom precision 0.01 @@ -267,7 +267,7 @@ Motor pcx $motor_driver_type [params \ axis G\ units mm\ hardlowerlim 0\ - hardupperlim 148.2\ + hardupperlim 154.2\ maxSpeed 10\ maxAccel 1\ maxDecel 1\ @@ -663,6 +663,15 @@ ss2d movecount $move_count ss2d part aperture.second ss2d long_name bottom +# Virtual and Simulated Motors +# ---------------------------- + +Motor msd ASIM [params\ + units mm\ + hardlowerlim 2500\ + hardupperlim 3500\ + ] + proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]} proc mthSet {val} { return "mtth=[SplitReply [mtth]]"} publish mthSet user