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

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
80 changed files with 2274 additions and 819 deletions

View File

@@ -313,17 +313,21 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
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 "[string index ${permlink} 0][format "%02d" ${id}]S06"
hsetprop ${scobj_hpath}/Level/Helium @description "[string index ${permlink} 0][format "%02d" ${id}]S06"
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"
@@ -333,11 +337,12 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
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 "[string index ${permlink} 0][format "%02d" ${id}]S05"
hsetprop ${scobj_hpath}/Level/Nitrogen @description "[string index ${permlink} 0][format "%02d" ${id}]S05"
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"
@@ -350,15 +355,19 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
}
hfactory ${scobj_hpath}/Loop1 plain spy none
hsetprop ${scobj_hpath}/Loop1 data "true"
hsetprop ${scobj_hpath}/Loop1 klass "@none"
hsetprop ${scobj_hpath}/Loop1 type "part"
hfactory ${scobj_hpath}/Loop1/nick plain user text
hsetprop ${scobj_hpath}/Loop1/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:MB1.T1:TEMP:NICK}
hsetprop ${scobj_hpath}/Loop1/nick rdText ${ns}::rdText ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop1/nick control true
hsetprop ${scobj_hpath}/Loop1/nick data true
hsetprop ${scobj_hpath}/Loop1/nick mutable false
hsetprop ${scobj_hpath}/Loop1/nick mutable true
hsetprop ${scobj_hpath}/Loop1/nick nxsave true
hsetprop ${scobj_hpath}/Loop1/nick oldval UNKNOWN
hsetprop ${scobj_hpath}/Loop1/nick klass "parameter"
hsetprop ${scobj_hpath}/Loop1/nick sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop1/nick type "part"
hsetprop ${scobj_hpath}/Loop1/nick nxalias "${name}_Loop1_nick"
@@ -368,9 +377,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop1/power rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop1/power control true
hsetprop ${scobj_hpath}/Loop1/power data true
hsetprop ${scobj_hpath}/Loop1/power mutable false
hsetprop ${scobj_hpath}/Loop1/power mutable true
hsetprop ${scobj_hpath}/Loop1/power nxsave true
hsetprop ${scobj_hpath}/Loop1/power oldval 0.0
hsetprop ${scobj_hpath}/Loop1/power klass "parameter"
hsetprop ${scobj_hpath}/Loop1/power sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop1/power type "part"
hsetprop ${scobj_hpath}/Loop1/power nxalias "${name}_Loop1_power"
@@ -380,11 +390,12 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop1/sensor rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop1/sensor control true
hsetprop ${scobj_hpath}/Loop1/sensor data true
hsetprop ${scobj_hpath}/Loop1/sensor mutable false
hsetprop ${scobj_hpath}/Loop1/sensor mutable true
hsetprop ${scobj_hpath}/Loop1/sensor nxsave true
hsetprop ${scobj_hpath}/Loop1/sensor permlink data_set "[string index ${permlink} 1][format "%02d" ${id}]S01"
hsetprop ${scobj_hpath}/Loop1/sensor @description "[string index ${permlink} 1][format "%02d" ${id}]S01"
hsetprop ${scobj_hpath}/Loop1/sensor oldval 0.0
hsetprop ${scobj_hpath}/Loop1/sensor klass "parameter"
hsetprop ${scobj_hpath}/Loop1/sensor sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop1/sensor type "part"
hsetprop ${scobj_hpath}/Loop1/sensor nxalias "${name}_Loop1_sensor"
@@ -402,7 +413,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop1/setpoint driveable Loop1/sensor
hsetprop ${scobj_hpath}/Loop1/setpoint control true
hsetprop ${scobj_hpath}/Loop1/setpoint data true
hsetprop ${scobj_hpath}/Loop1/setpoint mutable false
hsetprop ${scobj_hpath}/Loop1/setpoint mutable true
hsetprop ${scobj_hpath}/Loop1/setpoint nxsave true
hsetprop ${scobj_hpath}/Loop1/setpoint lowerlimit 0
hsetprop ${scobj_hpath}/Loop1/setpoint upperlimit 333
@@ -410,6 +421,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop1/setpoint permlink data_set "[string index ${permlink} 1][format "%02d" ${id}]SP01"
hsetprop ${scobj_hpath}/Loop1/setpoint @description "[string index ${permlink} 1][format "%02d" ${id}]SP01"
hsetprop ${scobj_hpath}/Loop1/setpoint oldval 0.0
hsetprop ${scobj_hpath}/Loop1/setpoint klass "parameter"
hsetprop ${scobj_hpath}/Loop1/setpoint sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop1/setpoint settle_time "15"
hsetprop ${scobj_hpath}/Loop1/setpoint type "drivable"
@@ -426,15 +438,19 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
}
hfactory ${scobj_hpath}/Loop2 plain spy none
hsetprop ${scobj_hpath}/Loop2 data "true"
hsetprop ${scobj_hpath}/Loop2 klass "@none"
hsetprop ${scobj_hpath}/Loop2 type "part"
hfactory ${scobj_hpath}/Loop2/nick plain user text
hsetprop ${scobj_hpath}/Loop2/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB6.T1:TEMP:NICK}
hsetprop ${scobj_hpath}/Loop2/nick rdText ${ns}::rdText ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop2/nick control true
hsetprop ${scobj_hpath}/Loop2/nick data true
hsetprop ${scobj_hpath}/Loop2/nick mutable false
hsetprop ${scobj_hpath}/Loop2/nick mutable true
hsetprop ${scobj_hpath}/Loop2/nick nxsave true
hsetprop ${scobj_hpath}/Loop2/nick oldval UNKNOWN
hsetprop ${scobj_hpath}/Loop2/nick klass "parameter"
hsetprop ${scobj_hpath}/Loop2/nick sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop2/nick type "part"
hsetprop ${scobj_hpath}/Loop2/nick nxalias "${name}_Loop2_nick"
@@ -444,9 +460,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop2/power rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop2/power control true
hsetprop ${scobj_hpath}/Loop2/power data true
hsetprop ${scobj_hpath}/Loop2/power mutable false
hsetprop ${scobj_hpath}/Loop2/power mutable true
hsetprop ${scobj_hpath}/Loop2/power nxsave true
hsetprop ${scobj_hpath}/Loop2/power oldval 0.0
hsetprop ${scobj_hpath}/Loop2/power klass "parameter"
hsetprop ${scobj_hpath}/Loop2/power sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop2/power type "part"
hsetprop ${scobj_hpath}/Loop2/power nxalias "${name}_Loop2_power"
@@ -456,11 +473,12 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop2/sensor rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop2/sensor control true
hsetprop ${scobj_hpath}/Loop2/sensor data true
hsetprop ${scobj_hpath}/Loop2/sensor mutable false
hsetprop ${scobj_hpath}/Loop2/sensor mutable true
hsetprop ${scobj_hpath}/Loop2/sensor nxsave true
hsetprop ${scobj_hpath}/Loop2/sensor permlink data_set "T[format "%02d" ${id}]S02"
hsetprop ${scobj_hpath}/Loop2/sensor @description "T[format "%02d" ${id}]S02"
hsetprop ${scobj_hpath}/Loop2/sensor oldval 0.0
hsetprop ${scobj_hpath}/Loop2/sensor klass "parameter"
hsetprop ${scobj_hpath}/Loop2/sensor sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop2/sensor type "part"
hsetprop ${scobj_hpath}/Loop2/sensor nxalias "${name}_Loop2_sensor"
@@ -478,7 +496,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop2/setpoint driveable Loop2/sensor
hsetprop ${scobj_hpath}/Loop2/setpoint control true
hsetprop ${scobj_hpath}/Loop2/setpoint data true
hsetprop ${scobj_hpath}/Loop2/setpoint mutable false
hsetprop ${scobj_hpath}/Loop2/setpoint mutable true
hsetprop ${scobj_hpath}/Loop2/setpoint nxsave true
hsetprop ${scobj_hpath}/Loop2/setpoint lowerlimit 0
hsetprop ${scobj_hpath}/Loop2/setpoint upperlimit 333
@@ -486,6 +504,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop2/setpoint permlink data_set "T[format "%02d" ${id}]SP02"
hsetprop ${scobj_hpath}/Loop2/setpoint @description "T[format "%02d" ${id}]SP02"
hsetprop ${scobj_hpath}/Loop2/setpoint oldval 0.0
hsetprop ${scobj_hpath}/Loop2/setpoint klass "parameter"
hsetprop ${scobj_hpath}/Loop2/setpoint sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop2/setpoint settle_time "15"
hsetprop ${scobj_hpath}/Loop2/setpoint type "drivable"
@@ -502,15 +521,19 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
}
hfactory ${scobj_hpath}/Loop3 plain spy none
hsetprop ${scobj_hpath}/Loop3 data "true"
hsetprop ${scobj_hpath}/Loop3 klass "@none"
hsetprop ${scobj_hpath}/Loop3 type "part"
hfactory ${scobj_hpath}/Loop3/nick plain user text
hsetprop ${scobj_hpath}/Loop3/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB7.T1:TEMP:NICK}
hsetprop ${scobj_hpath}/Loop3/nick rdText ${ns}::rdText ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop3/nick control true
hsetprop ${scobj_hpath}/Loop3/nick data true
hsetprop ${scobj_hpath}/Loop3/nick mutable false
hsetprop ${scobj_hpath}/Loop3/nick mutable true
hsetprop ${scobj_hpath}/Loop3/nick nxsave true
hsetprop ${scobj_hpath}/Loop3/nick oldval UNKNOWN
hsetprop ${scobj_hpath}/Loop3/nick klass "parameter"
hsetprop ${scobj_hpath}/Loop3/nick sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop3/nick type "part"
hsetprop ${scobj_hpath}/Loop3/nick nxalias "${name}_Loop3_nick"
@@ -520,9 +543,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop3/power rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop3/power control true
hsetprop ${scobj_hpath}/Loop3/power data true
hsetprop ${scobj_hpath}/Loop3/power mutable false
hsetprop ${scobj_hpath}/Loop3/power mutable true
hsetprop ${scobj_hpath}/Loop3/power nxsave true
hsetprop ${scobj_hpath}/Loop3/power oldval 0.0
hsetprop ${scobj_hpath}/Loop3/power klass "parameter"
hsetprop ${scobj_hpath}/Loop3/power sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop3/power type "part"
hsetprop ${scobj_hpath}/Loop3/power nxalias "${name}_Loop3_power"
@@ -532,11 +556,12 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop3/sensor rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop3/sensor control true
hsetprop ${scobj_hpath}/Loop3/sensor data true
hsetprop ${scobj_hpath}/Loop3/sensor mutable false
hsetprop ${scobj_hpath}/Loop3/sensor mutable true
hsetprop ${scobj_hpath}/Loop3/sensor nxsave true
hsetprop ${scobj_hpath}/Loop3/sensor permlink data_set "T[format "%02d" ${id}]S03"
hsetprop ${scobj_hpath}/Loop3/sensor @description "T[format "%02d" ${id}]S03"
hsetprop ${scobj_hpath}/Loop3/sensor oldval 0.0
hsetprop ${scobj_hpath}/Loop3/sensor klass "parameter"
hsetprop ${scobj_hpath}/Loop3/sensor sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop3/sensor type "part"
hsetprop ${scobj_hpath}/Loop3/sensor nxalias "${name}_Loop3_sensor"
@@ -554,7 +579,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop3/setpoint driveable Loop3/sensor
hsetprop ${scobj_hpath}/Loop3/setpoint control true
hsetprop ${scobj_hpath}/Loop3/setpoint data true
hsetprop ${scobj_hpath}/Loop3/setpoint mutable false
hsetprop ${scobj_hpath}/Loop3/setpoint mutable true
hsetprop ${scobj_hpath}/Loop3/setpoint nxsave true
hsetprop ${scobj_hpath}/Loop3/setpoint lowerlimit 0
hsetprop ${scobj_hpath}/Loop3/setpoint upperlimit 333
@@ -562,6 +587,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop3/setpoint permlink data_set "T[format "%02d" ${id}]SP03"
hsetprop ${scobj_hpath}/Loop3/setpoint @description "T[format "%02d" ${id}]SP03"
hsetprop ${scobj_hpath}/Loop3/setpoint oldval 0.0
hsetprop ${scobj_hpath}/Loop3/setpoint klass "parameter"
hsetprop ${scobj_hpath}/Loop3/setpoint sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop3/setpoint settle_time "15"
hsetprop ${scobj_hpath}/Loop3/setpoint type "drivable"
@@ -578,15 +604,19 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
}
hfactory ${scobj_hpath}/Loop4 plain spy none
hsetprop ${scobj_hpath}/Loop4 data "true"
hsetprop ${scobj_hpath}/Loop4 klass "@none"
hsetprop ${scobj_hpath}/Loop4 type "part"
hfactory ${scobj_hpath}/Loop4/nick plain user text
hsetprop ${scobj_hpath}/Loop4/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.T1:TEMP:NICK}
hsetprop ${scobj_hpath}/Loop4/nick rdText ${ns}::rdText ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop4/nick control true
hsetprop ${scobj_hpath}/Loop4/nick data true
hsetprop ${scobj_hpath}/Loop4/nick mutable false
hsetprop ${scobj_hpath}/Loop4/nick mutable true
hsetprop ${scobj_hpath}/Loop4/nick nxsave true
hsetprop ${scobj_hpath}/Loop4/nick oldval UNKNOWN
hsetprop ${scobj_hpath}/Loop4/nick klass "parameter"
hsetprop ${scobj_hpath}/Loop4/nick sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop4/nick type "part"
hsetprop ${scobj_hpath}/Loop4/nick nxalias "${name}_Loop4_nick"
@@ -596,9 +626,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop4/power rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop4/power control true
hsetprop ${scobj_hpath}/Loop4/power data true
hsetprop ${scobj_hpath}/Loop4/power mutable false
hsetprop ${scobj_hpath}/Loop4/power mutable true
hsetprop ${scobj_hpath}/Loop4/power nxsave true
hsetprop ${scobj_hpath}/Loop4/power oldval 0.0
hsetprop ${scobj_hpath}/Loop4/power klass "parameter"
hsetprop ${scobj_hpath}/Loop4/power sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop4/power type "part"
hsetprop ${scobj_hpath}/Loop4/power nxalias "${name}_Loop4_power"
@@ -608,11 +639,12 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop4/sensor rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Loop4/sensor control true
hsetprop ${scobj_hpath}/Loop4/sensor data true
hsetprop ${scobj_hpath}/Loop4/sensor mutable false
hsetprop ${scobj_hpath}/Loop4/sensor mutable true
hsetprop ${scobj_hpath}/Loop4/sensor nxsave true
hsetprop ${scobj_hpath}/Loop4/sensor permlink data_set "T[format "%02d" ${id}]S04"
hsetprop ${scobj_hpath}/Loop4/sensor @description "T[format "%02d" ${id}]S04"
hsetprop ${scobj_hpath}/Loop4/sensor oldval 0.0
hsetprop ${scobj_hpath}/Loop4/sensor klass "parameter"
hsetprop ${scobj_hpath}/Loop4/sensor sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop4/sensor type "part"
hsetprop ${scobj_hpath}/Loop4/sensor nxalias "${name}_Loop4_sensor"
@@ -630,7 +662,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop4/setpoint driveable Loop4/sensor
hsetprop ${scobj_hpath}/Loop4/setpoint control true
hsetprop ${scobj_hpath}/Loop4/setpoint data true
hsetprop ${scobj_hpath}/Loop4/setpoint mutable false
hsetprop ${scobj_hpath}/Loop4/setpoint mutable true
hsetprop ${scobj_hpath}/Loop4/setpoint nxsave true
hsetprop ${scobj_hpath}/Loop4/setpoint lowerlimit 0
hsetprop ${scobj_hpath}/Loop4/setpoint upperlimit 333
@@ -638,6 +670,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Loop4/setpoint permlink data_set "T[format "%02d" ${id}]SP04"
hsetprop ${scobj_hpath}/Loop4/setpoint @description "T[format "%02d" ${id}]SP04"
hsetprop ${scobj_hpath}/Loop4/setpoint oldval 0.0
hsetprop ${scobj_hpath}/Loop4/setpoint klass "parameter"
hsetprop ${scobj_hpath}/Loop4/setpoint sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Loop4/setpoint settle_time "15"
hsetprop ${scobj_hpath}/Loop4/setpoint type "drivable"
@@ -654,17 +687,21 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
}
hfactory ${scobj_hpath}/Valve plain spy none
hsetprop ${scobj_hpath}/Valve data "true"
hsetprop ${scobj_hpath}/Valve klass "@none"
hsetprop ${scobj_hpath}/Valve type "part"
hfactory ${scobj_hpath}/Valve/sensor plain user float
hsetprop ${scobj_hpath}/Valve/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB4.G1:AUX:SIG:OPEN}
hsetprop ${scobj_hpath}/Valve/sensor rdValue ${ns}::rdValue ${scobj_hpath}
hsetprop ${scobj_hpath}/Valve/sensor control true
hsetprop ${scobj_hpath}/Valve/sensor data true
hsetprop ${scobj_hpath}/Valve/sensor mutable false
hsetprop ${scobj_hpath}/Valve/sensor mutable true
hsetprop ${scobj_hpath}/Valve/sensor nxsave true
hsetprop ${scobj_hpath}/Valve/sensor permlink data_set "G[format "%02d" ${id}]S07"
hsetprop ${scobj_hpath}/Valve/sensor @description "G[format "%02d" ${id}]S07"
hsetprop ${scobj_hpath}/Valve/sensor oldval 0.0
hsetprop ${scobj_hpath}/Valve/sensor klass "parameter"
hsetprop ${scobj_hpath}/Valve/sensor sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Valve/sensor type "part"
hsetprop ${scobj_hpath}/Valve/sensor nxalias "${name}_Valve_sensor"
@@ -680,7 +717,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Valve/setpoint driveable Valve/sensor
hsetprop ${scobj_hpath}/Valve/setpoint control true
hsetprop ${scobj_hpath}/Valve/setpoint data true
hsetprop ${scobj_hpath}/Valve/setpoint mutable false
hsetprop ${scobj_hpath}/Valve/setpoint mutable true
hsetprop ${scobj_hpath}/Valve/setpoint nxsave true
hsetprop ${scobj_hpath}/Valve/setpoint lowerlimit 0
hsetprop ${scobj_hpath}/Valve/setpoint upperlimit 100
@@ -688,6 +725,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
hsetprop ${scobj_hpath}/Valve/setpoint permlink data_set "G[format "%02d" ${id}]SP07"
hsetprop ${scobj_hpath}/Valve/setpoint @description "G[format "%02d" ${id}]SP07"
hsetprop ${scobj_hpath}/Valve/setpoint oldval 0.0
hsetprop ${scobj_hpath}/Valve/setpoint klass "parameter"
hsetprop ${scobj_hpath}/Valve/setpoint sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/Valve/setpoint settle_time "30"
hsetprop ${scobj_hpath}/Valve/setpoint type "drivable"
@@ -700,6 +738,7 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve
::scobj::mercury_scpi::sics_log 9 "[environment_simulation] => No poll/write for mercury_scpi"
}
hsetprop ${scobj_hpath} klass environment
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}