multichan becomes AsyncQueue and AsyncProtocol

r1965 | dcl | 2007-05-15 13:15:34 +1000 (Tue, 15 May 2007) | 2 lines
2007-05-15 13:15:34 +10:00
parent 1ea715020a
commit f374e445bf
7 changed files with 98 additions and 242 deletions
--- a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
@@ -1,7 +1,7 @@
-# $Revision: 1.2 $
-# $Date: 2007-05-10 06:12:25 $
+# $Revision: 1.3 $
+# $Date: 2007-05-15 03:15:00 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: ffr $
+# Last revision by: $Author: dcl $

 # START MOTOR CONFIGURATION

@@ -26,10 +26,10 @@ set dmc2280_controller3(port) pmc3-$animal
 set dmc2280_controller4(host) mc4-$animal
 set dmc2280_controller4(port) pmc4-$animal

-MakeMultiChan mc1 $dmc2280_controller1(host) $dmc2280_controller1(port)
-MakeMultiChan mc2 $dmc2280_controller2(host) $dmc2280_controller2(port)
-MakeMultiChan mc3 $dmc2280_controller3(host) $dmc2280_controller3(port)
-MakeMultiChan mc4 $dmc2280_controller4(host) $dmc2280_controller4(port)
+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
 set mphi_Home 7500000
@@ -55,9 +55,7 @@ set move_count 10

 # Monochromator phi, Tilt 1, upper
 Motor mphi $motor_driver_type [params \
-  multichan mc1\
-  host $dmc2280_controller1(host)\
-  port $dmc2280_controller1(port)\
+  asyncqueue mc1\
  axis A\
  units degrees\
  hardlowerlim -5\
@@ -78,9 +76,7 @@ mphi long_name phi

 # Monochromator chi, Tilt 2, lower
 Motor mchi $motor_driver_type [params \
-  multichan mc1\
-  host $dmc2280_controller1(host)\
-  port $dmc2280_controller1(port)\
+  asyncqueue mc1\
  axis B\
  units degrees\
  hardlowerlim 85\
@@ -101,9 +97,7 @@ mchi long_name chi

 # Monochromator Trans 1, upper
 Motor my $motor_driver_type [params \
-  multichan mc1\
-  host $dmc2280_controller1(host)\
-  port $dmc2280_controller1(port)\
+  asyncqueue mc1\
  axis C\
  units mm\
  hardlowerlim -10\
@@ -124,9 +118,7 @@ my long_name translate_y

 # Monochromator Trans 2, lower
 Motor mx $motor_driver_type [params \
-  multichan mc1\
-  host $dmc2280_controller1(host)\
-  port $dmc2280_controller1(port)\
+  asyncqueue mc1\
  axis D\
  units mm\
  hardlowerlim -10\
@@ -147,9 +139,7 @@ mx long_name translate_x

 # Monochromator omega, rotate
 Motor mom $motor_driver_type [params \
-  multichan mc1\
-  host $dmc2280_controller1(host)\
-  port $dmc2280_controller1(port)\
+  asyncqueue mc1\
  axis E\
  units degrees\
  hardlowerlim -5\
@@ -170,9 +160,7 @@ mom long_name rotate

 # Monochromator two-theta, flight-tube rotate
 Motor mtth $motor_driver_type [params \
-  multichan mc1\
-  host $dmc2280_controller1(host)\
-  port $dmc2280_controller1(port)\
+  asyncqueue mc1\
  axis F\
  units degrees\
  hardlowerlim 45\
@@ -211,9 +199,7 @@ mtth long_name takeoff_angle

 # Sample Trans, vertical, first stage
 Motor sz1 $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis A\
  units mm\
  hardlowerlim 0\
@@ -230,9 +216,7 @@ sz1 long_name vertical_translation

 # Sample Trans, vertical, second stage
 Motor sz2 $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis B\
  units mm\
  hardlowerlim 0\
@@ -249,9 +233,7 @@ sz2 long_name vertical_translation

 # Sample Trans 1, upper, y
 Motor sy $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis C\
  units mm\
  hardlowerlim -20\
@@ -272,9 +254,7 @@ sy long_name translate_y

 # Sample Trans2, lower, x
 Motor sx $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis D\
  units mm\
  hardlowerlim -20\
@@ -295,9 +275,7 @@ sx long_name translate_x

 # Sample Omega, rotate
 Motor som $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis E\
  units degrees\
  hardlowerlim -54\
@@ -317,9 +295,7 @@ som long_name rotate

 # Sample two-theta, detector rotate
 Motor stth $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis F\
  units degrees\
  hardlowerlim -120\
@@ -350,9 +326,7 @@ stth long_name azimuthal_angle

 # Monochromator Focusing (HOPG)
 #Motor mf1 $motor_driver_type [params \
-#  multichan mc3\
-#  host $dmc2280_controller3(host)\
-#  port $dmc2280_controller3(port)\
+#  asyncqueue mc3\
 #  axis A\
 #  units degrees\
 #  hardlowerlim xxxx\
@@ -373,8 +347,6 @@ stth long_name azimuthal_angle

 # Monochromator Focusing (Ge)
 Motor mf2 $motor_driver_type [params \
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
  axis B\
  units degrees\
  hardlowerlim 0\
@@ -394,8 +366,6 @@ mf2 long_name mf2

 ## Eulerian-chi
 #Motor echi $motor_driver_type [params \
-#	host $dmc2280_controller3(host)\
-#	port $dmc2280_controller3(port)\
 #	axis G\
 #        units degrees\
 #        maxSpeed 1\
@@ -408,8 +378,6 @@ mf2 long_name mf2

 ## Eulerian-phi
 #Motor ephi $motor_driver_type [params \
-#	host $dmc2280_controller3(host)\
-#	port $dmc2280_controller3(port)\
 #	axis H\
 #        units degrees\
 #        maxSpeed 1\
@@ -429,8 +397,6 @@ mf2 long_name mf2

 # Primary Slit, horizontal offset, 0-30mm
 Motor psho $motor_driver_type [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
  axis A\
  units mm\
  hardlowerlim 0\
@@ -446,8 +412,6 @@ setHomeandRange -motor psho  -home 0 -lowrange 0 -uprange 30

 # Primary Slit, position 0-150mm
 Motor psp $motor_driver_type [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
  axis B\
  units mm\
  hardlowerlim 0\
@@ -463,8 +427,6 @@ setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150

 # Primary Slit, width, 0-30mm
 Motor psw $motor_driver_type [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
  axis C\
  units mm\
  hardlowerlim 0\
@@ -480,8 +442,6 @@ setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30

 ## Primary Slit, height, 0-30mm
 #Motor psh $motor_driver_type [params \
-#	host $dmc2280_controller4(host)\
-#	port $dmc2280_controller4(port)\
 #        axis D\
 #        units mm\
 #        hardlowerlim 0\
@@ -499,8 +459,6 @@ setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30

 # Secondary Slit, horizontal offset
 Motor ssho $motor_driver_type [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
  axis E\
  units mm\
  hardlowerlim 0\
@@ -516,8 +474,6 @@ setHomeandRange -motor ssho  -home 0 -lowrange 0 -uprange 30

 # Secondary Slit, position
 Motor ssp $motor_driver_type [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
  axis F\
  units mm\
  hardlowerlim 0\
@@ -533,8 +489,6 @@ setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 150

 # Secondary Slit, width
 Motor ssw $motor_driver_type [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
  axis G\
  units mm\
  hardlowerlim 0\
@@ -550,8 +504,6 @@ setHomeandRange -motor ssw  -home 0 -lowrange 0 -uprange 30

 ## Secondary Slit, height
 #Motor ssh $motor_driver_type [params \
-#  host $dmc2280_controller4(host)\
-#  port $dmc2280_controller4(port)\
 #  axis H\
 #  units mm\
 #  hardlowerlim 0\