linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'RELEASE-3_1'

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
This commit is contained in:
Douglas Clowes
2014-11-06 14:13:20 +11:00
parent 2076c0a5fc 8a61f65701
commit 3ce5ae0977
52 changed files with 4133 additions and 3116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
site_ansto/instrument/dingo/config/plc/plc.tcl
View File

@@ -5,8 +5,6 @@ if {$sim_mode == "false"} {
MakeSafetyPLC plc plc_chan 0
}
makesctcontroller sct_shutter std 137.157.204.213:30000
# Configuration Note:
#
# A default setting has been set in safetyplc.c code. following configuration
@@ -51,14 +49,38 @@ proc focuslight {args} {
sct_shutter transact $cmd
}
proc tertiary_shutter {args} {
set cmd "set tertiary shutter=$args\r\n"
sct_shutter transact $cmd
proc tertiary {sw} {
set sw [string tolower $sw]
switch $sw {
"open" {
wait 1
plc_chan send set output=0
wait 1
plc_chan send set output=3
wait 1
plc_chan send set output=1
wait 1
plc_chan send set output=3
}
"close" {
wait 1
plc_chan send set output=0
wait 1
plc_chan send set output=3
wait 1
plc_chan send set output=2
wait 1
plc_chan send set output=3
}
default {
clientput ERROR: [info level 0] command should be open or close not $sw
}
}
}
publish shutter user
publish focuslight user
publish tertiary_shutter user
publish tertiary user
source $cfPath(plc)/plc_common_1.tcl