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

10
site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
View File

@@ -150,17 +150,21 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name id } {
set scobj_hpath /sics/${name}
hfactory ${scobj_hpath}/Level plain spy none
hsetprop ${scobj_hpath}/Level data "true"
hsetprop ${scobj_hpath}/Level klass "@none"
hsetprop ${scobj_hpath}/Level type "part"
hfactory ${scobj_hpath}/Level/Helium plain user float
hsetprop ${scobj_hpath}/Level/Helium read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:HEL:LEV}
hsetprop ${scobj_hpath}/Level/Helium rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Level/Helium control true
hsetprop ${scobj_hpath}/Level/Helium data true
hsetprop ${scobj_hpath}/Level/Helium mutable false
hsetprop ${scobj_hpath}/Level/Helium mutable true
hsetprop ${scobj_hpath}/Level/Helium nxsave true
hsetprop ${scobj_hpath}/Level/Helium permlink data_set "L[format "%02d" ${id}]S02"
hsetprop ${scobj_hpath}/Level/Helium @description "L[format "%02d" ${id}]S02"
hsetprop ${scobj_hpath}/Level/Helium oldval 0.0
hsetprop ${scobj_hpath}/Level/Helium klass "parameter"
hsetprop ${scobj_hpath}/Level/Helium sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Level/Helium type "part"
hsetprop ${scobj_hpath}/Level/Helium nxalias "${name}_Level_Helium"
@@ -170,11 +174,12 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name id } {
hsetprop ${scobj_hpath}/Level/Nitrogen rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Level/Nitrogen control true
hsetprop ${scobj_hpath}/Level/Nitrogen data true
hsetprop ${scobj_hpath}/Level/Nitrogen mutable false
hsetprop ${scobj_hpath}/Level/Nitrogen mutable true
hsetprop ${scobj_hpath}/Level/Nitrogen nxsave true
hsetprop ${scobj_hpath}/Level/Nitrogen permlink data_set "L[format "%02d" ${id}]S01"
hsetprop ${scobj_hpath}/Level/Nitrogen @description "L[format "%02d" ${id}]S01"
hsetprop ${scobj_hpath}/Level/Nitrogen oldval 0.0
hsetprop ${scobj_hpath}/Level/Nitrogen klass "parameter"
hsetprop ${scobj_hpath}/Level/Nitrogen sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Level/Nitrogen type "part"
hsetprop ${scobj_hpath}/Level/Nitrogen nxalias "${name}_Level_Nitrogen"
@@ -186,6 +191,7 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name id } {
::scobj::mercury_level::sics_log 9 "[environment_simulation] => No poll/write for mercury_level"
}
hsetprop ${scobj_hpath} klass environment
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
# mkDriver hook code goes here
} catch_message ]