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/hipd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.14 $
-# $Date: 2007-05-11 07:34:24 $
+# $Revision: 1.15 $
+# $Date: 2007-05-15 03:15:00 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: dcl $

@@ -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 7613516
@@ -109,9 +109,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\
@@ -132,9 +130,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\
@@ -155,9 +151,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\
@@ -178,9 +172,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\
@@ -201,9 +193,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\
@@ -224,9 +214,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\
@@ -265,9 +253,7 @@ mtth long_name takeoff_angle

 # Sample Tilt 1, upper, phi
 Motor sphi $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis A\
  units degrees\
  hardlowerlim -15\
@@ -288,9 +274,7 @@ sphi long_name phi

 # Sample Tilt 2, lower, chi
 Motor schi $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis B\
  units degrees\
  hardlowerlim 75\
@@ -311,9 +295,7 @@ schi long_name chi

 # 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\
@@ -334,9 +316,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\
@@ -357,9 +337,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\
@@ -379,9 +357,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\
@@ -404,9 +380,7 @@ stth long_name azimuthal_angle

 # Oscillating Collimator Translation
 Motor oct $motor_driver_type [params \
-  multichan mc2\
-  host $dmc2280_controller2(host)\
-  port $dmc2280_controller2(port)\
+  asyncqueue mc2\
  axis G\
  units degrees\
  hardlowerlim -2\
@@ -435,9 +409,7 @@ oct long_name oct

 # 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\
@@ -458,9 +430,7 @@ oct long_name oct

 # Monochromator Focusing (Ge)
 Motor mf2 $motor_driver_type [params \
-  multichan mc3\
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
+  asyncqueue mc3\
  axis A\
  units degrees\
  hardlowerlim 0\
@@ -480,9 +450,7 @@ mf2 long_name mf2

 # Slit 1, right
 Motor ss1r $motor_driver_type [params \
-  multichan mc3\
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
+  asyncqueue mc3\
  axis E\
  units mm\
  hardlowerlim $ss1r_LoRange\
@@ -501,9 +469,7 @@ ss1r long_name right

 # Slit 1, left
 Motor ss1l $motor_driver_type [params \
-  multichan mc3\
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
+  asyncqueue mc3\
  axis F\
  units mm\
  hardlowerlim $ss1l_LoRange\
@@ -522,9 +488,7 @@ ss1l long_name left

 # Slit 1, up
 Motor ss1u $motor_driver_type [params \
-  multichan mc3\
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
+  asyncqueue mc3\
  axis G\
  units mm\
  hardlowerlim $ss1u_LoRange\
@@ -543,9 +507,7 @@ ss1u long_name top

 # Slit 1, down
 Motor ss1d $motor_driver_type [params \
-  multichan mc3\
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
+  asyncqueue mc3\
  axis H\
  units mm\
  hardlowerlim $ss1d_LoRange\
@@ -571,9 +533,7 @@ ss1d long_name bottom

 # Slit 2, right
 Motor ss2r $motor_driver_type [params \
-  multichan mc4\
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
+  asyncqueue mc4\
  axis E\
  units mm\
  hardlowerlim $ss2r_LoRange\
@@ -592,9 +552,7 @@ ss2r long_name right

 # Slit 2, left
 Motor ss2l $motor_driver_type [params \
-  multichan mc4\
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
+  asyncqueue mc4\
  axis F\
  units mm\
  hardlowerlim $ss2l_LoRange\
@@ -613,9 +571,7 @@ ss2l long_name left

 # Slit 2, up
 Motor ss2u $motor_driver_type [params \
-  multichan mc4\
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
+  asyncqueue mc4\
  axis G\
  units mm\
  hardlowerlim $ss2u_LoRange\
@@ -634,9 +590,7 @@ ss2u long_name top

 # Slit 2, down
 Motor ss2d $motor_driver_type [params \
-  multichan mc4\
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
+  asyncqueue mc4\
  axis H\
  units mm\
  hardlowerlim $ss2d_LoRange\
--- a/site_ansto/instrument/hipd/config/plc/plc.tcl
+++ b/site_ansto/instrument/hipd/config/plc/plc.tcl
@@ -1,4 +1,4 @@
-MakeMultiChan plc_chan 137.157.204.65 30001
+MakeAsyncQueue plc_chan SafetyPLC 137.157.204.65 30001
 MakeSafetyPLC plc plc_chan 0

 source $cfPath(plc)/plc_common_1.tcl