From fb7685ff8d89a119573ad44933996db171e96c93 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Wed, 22 May 2013 10:56:01 +1000 Subject: [PATCH] Integrate Dingo Camera Server Stuffs --- .../instrument/dingo/dingo_configuration.tcl | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/site_ansto/instrument/dingo/dingo_configuration.tcl b/site_ansto/instrument/dingo/dingo_configuration.tcl index c2224ae0..2d8e6aa3 100644 --- a/site_ansto/instrument/dingo/dingo_configuration.tcl +++ b/site_ansto/instrument/dingo/dingo_configuration.tcl @@ -14,15 +14,36 @@ source server_config.tcl ######################################## # INSTRUMENT SPECIFIC CONFIGURATION +Motor dummy_motor asim [params \ + asyncqueue mc1\ + host mc1-dingo\ + port pmc1-dingo\ + axis A\ + units mm\ + hardlowerlim -500\ + hardupperlim 500\ + maxSpeed 1\ + maxAccel 5\ + maxDecel 5\ + stepsPerX [expr 25000.0/5.0]\ + absEnc 1\ + absEncHome 0\ + cntsPerX [expr 8192.0/5.0]] +dummy_motor part instrument +dummy_motor long_name dummy_motor +dummy_motor softlowerlim -500 +dummy_motor softupperlim 500 +dummy_motor home 0 + source $cfPath(hipadaba)/hipadaba_configuration.tcl fileeval $cfPath(source)/source.tcl -fileeval $cfPath(motors)/motor_configuration.tcl -fileeval $cfPath(motors)/positmotor_configuration.tcl +#fileeval $cfPath(motors)/motor_configuration.tcl +#fileeval $cfPath(motors)/positmotor_configuration.tcl #fileeval $cfPath(motors)/extraconfig.tcl fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl -fileeval $cfPath(hmm)/hmm_configuration.tcl +#fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl fileeval $cfPath(commands)/commands.tcl @@ -30,8 +51,8 @@ fileeval $cfPath(anticollider)/anticollider.tcl source gumxml.tcl -::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false -::anticollider::protect_detector "true" +#::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false +#::anticollider::protect_detector "true" # fix all motors foreach m [sicslist type motor] { @@ -44,6 +65,9 @@ foreach m [sicslist type motor] { } server_init + +clientput "serverport [get_portnum $::serverport]" + ########################################### # WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.