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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
2014-08-06 13:53:18 +10:00
parent 05dc1958ff 639e4dc3c8
commit 507ddafb2a
80 changed files with 2274 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
site_ansto/instrument/config/environment/omron_hldc_sct.tcl
View File

@@ -210,6 +210,7 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath}/distance mutable true
hsetprop ${scobj_hpath}/distance nxsave true
hsetprop ${scobj_hpath}/distance oldval 0.0
hsetprop ${scobj_hpath}/distance klass "parameter"
hsetprop ${scobj_hpath}/distance sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/distance type "part"
hsetprop ${scobj_hpath}/distance nxalias "${name}_distance"
@@ -219,13 +220,18 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath}/id read_id ${ns}::read_id ${scobj_hpath}
hsetprop ${scobj_hpath}/id control true
hsetprop ${scobj_hpath}/id data true
hsetprop ${scobj_hpath}/id mutable false
hsetprop ${scobj_hpath}/id mutable true
hsetprop ${scobj_hpath}/id nxsave true
hsetprop ${scobj_hpath}/id oldval UNKNOWN
hsetprop ${scobj_hpath}/id klass "parameter"
hsetprop ${scobj_hpath}/id sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/id type "part"
hsetprop ${scobj_hpath}/id nxalias "${name}_id"
hsetprop ${scobj_hpath} data "true"
hsetprop ${scobj_hpath} klass "@none"
hsetprop ${scobj_hpath} type "part"
if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
${sct_controller} poll ${scobj_hpath}/distance 1
${sct_controller} poll ${scobj_hpath}/id 10
@@ -233,6 +239,7 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name } {
::scobj::omron_hldc::sics_log 9 "[environment_simulation] => No poll/write for omron_hldc"
}
hsetprop ${scobj_hpath} klass environment
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
# mkDriver hook code goes here
} catch_message ]