Manually merged the following changes from RELEASE-2_0P1
commands_common.tcl fixed counter feedback anticollider_common.tcl implement anticollider administrative override reflectometer,sans/.../anticollider.tcl implement administrative override to move detector r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines
This commit is contained in:
committed by
Douglas Clowes
parent
177d5f3ed6
commit
6c6156174f
@@ -1,8 +1,18 @@
|
||||
|
||||
# $Revision: 1.2 $
|
||||
# $Date: 2008-05-30 00:26:57 $
|
||||
# $Revision: 1.3 $
|
||||
# $Date: 2008-06-12 02:55:28 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
source $cfPath(anticollider)/anticollider_common.tcl
|
||||
|
||||
# NOTE: This is called with a list of motorname target pairs
|
||||
proc ::anticollider::enable {args} {
|
||||
if {[SplitReply [::anticollider::protect_detector]] == "false"} {
|
||||
return "false"
|
||||
} else {
|
||||
return "true"
|
||||
}
|
||||
}
|
||||
|
||||
::anticollider::loadscript acscript.txt
|
||||
|
||||
Reference in New Issue
Block a user