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

Regenerate all the SCT drivers with new generator

Browse Source
This commit is contained in:
Douglas Clowes
2014-11-07 09:14:09 +11:00
parent 6c6292bbb2
commit 9909c1412e
42 changed files with 2483 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
View File

@@ -243,9 +243,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
set scobj_hpath /sics/${name}
hfactory ${scobj_hpath}/blade_1 plain spy none
hsetprop ${scobj_hpath}/blade_1 data "true"
hsetprop ${scobj_hpath}/blade_1 klass "@none"
hsetprop ${scobj_hpath}/blade_1 type "part"
hfactory ${scobj_hpath}/blade_1/aphase plain user float
hsetprop ${scobj_hpath}/blade_1/aphase control true
@@ -318,14 +315,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/blade_1/state 1
hsetprop ${scobj_hpath}/blade_1/state simulated false
} else {
::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
hsetprop ${scobj_hpath}/blade_1/state simulated true
}
hsetprop ${scobj_hpath}/blade_1 data "true"
hsetprop ${scobj_hpath}/blade_1 klass "@none"
hsetprop ${scobj_hpath}/blade_1 type "part"
hfactory ${scobj_hpath}/blade_2 plain spy none
hsetprop ${scobj_hpath}/blade_2 data "true"
hsetprop ${scobj_hpath}/blade_2 klass "@none"
hsetprop ${scobj_hpath}/blade_2 type "part"
hfactory ${scobj_hpath}/blade_2/aphase plain user float
hsetprop ${scobj_hpath}/blade_2/aphase control true
@@ -398,14 +397,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/blade_2/state 1
hsetprop ${scobj_hpath}/blade_2/state simulated false
} else {
::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
hsetprop ${scobj_hpath}/blade_2/state simulated true
}
hsetprop ${scobj_hpath}/blade_2 data "true"
hsetprop ${scobj_hpath}/blade_2 klass "@none"
hsetprop ${scobj_hpath}/blade_2 type "part"
hfactory ${scobj_hpath}/blade_3 plain spy none
hsetprop ${scobj_hpath}/blade_3 data "true"
hsetprop ${scobj_hpath}/blade_3 klass "@none"
hsetprop ${scobj_hpath}/blade_3 type "part"
hfactory ${scobj_hpath}/blade_3/aphase plain user float
hsetprop ${scobj_hpath}/blade_3/aphase control true
@@ -478,14 +479,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/blade_3/state 1
hsetprop ${scobj_hpath}/blade_3/state simulated false
} else {
::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
hsetprop ${scobj_hpath}/blade_3/state simulated true
}
hsetprop ${scobj_hpath}/blade_3 data "true"
hsetprop ${scobj_hpath}/blade_3 klass "@none"
hsetprop ${scobj_hpath}/blade_3 type "part"
hfactory ${scobj_hpath}/blade_4 plain spy none
hsetprop ${scobj_hpath}/blade_4 data "true"
hsetprop ${scobj_hpath}/blade_4 klass "@none"
hsetprop ${scobj_hpath}/blade_4 type "part"
hfactory ${scobj_hpath}/blade_4/aphase plain user float
hsetprop ${scobj_hpath}/blade_4/aphase control true
@@ -558,9 +561,14 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/blade_4/state 1
hsetprop ${scobj_hpath}/blade_4/state simulated false
} else {
::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
hsetprop ${scobj_hpath}/blade_4/state simulated true
}
hsetprop ${scobj_hpath}/blade_4 data "true"
hsetprop ${scobj_hpath}/blade_4 klass "@none"
hsetprop ${scobj_hpath}/blade_4 type "part"
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
@@ -582,7 +590,9 @@ proc ::scobj::astrium_chopper::add_driver {name device_class simulation_flag ip_
makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
}
} else {
::scobj::astrium_chopper::sics_log 9 "simulation_flag={simulation_flag} => No sctcontroller for astrium_chopper"
::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for astrium_chopper"
::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL
}
::scobj::astrium_chopper::sics_log 1 "::scobj::astrium_chopper::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}"
::scobj::astrium_chopper::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
@@ -600,7 +610,7 @@ namespace eval ::scobj::astrium_chopper {
proc add_astrium_chopper {name ip_address tcp_port} {
set simulation_flag "[string tolower [SplitReply [chopper_simulation]]]"
::scobj::astrium_chopper::add_driver ${name} "NXdisk_chopper" "${simulation_flag}" ${ip_address} ${tcp_port}
::scobj::astrium_chopper::add_driver ${name} "NXdisk_chopper" ${simulation_flag} ${ip_address} ${tcp_port}
}
clientput "file evaluation of sct_astrium_chopper.tcl"
@@ -639,20 +649,31 @@ proc ::scobj::astrium_chopper::read_config {} {
if { ![string equal -nocase "${simulation_flag}" "false"] } {
set asyncqueue "null"
${ns}::sics_log 9 "simulation_flag=${simulation_flag} => using null asyncqueue"
${ns}::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL
} elseif { [dict exists $v "asyncqueue"] } {
set asyncqueue [dict get $v "asyncqueue"]
if { [string equal -nocase ${asyncqueue} "sct"] } {
set ip_address [dict get $v ip]
set tcp_port [dict get $v port]
}
makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
} else {
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
} else {
if { [dict exists $v "asyncprotocol"] } {
set asyncprotocol [dict get $v "asyncprotocol"]
} else {
set asyncprotocol ${name}_protocol
MakeAsyncProtocol ${asyncprotocol}
if { [dict exists $v "terminator"] } {
if { [dict exists $v "sendterminator"] } {
${asyncprotocol} sendterminator "[dict get $v "sendterminator"]"
} elseif { [dict exists $v "terminator"] } {
${asyncprotocol} sendterminator "[dict get $v "terminator"]"
}
if { [dict exists $v "replyterminator"] } {
${asyncprotocol} replyterminator "[dict get $v "replyterminator"]"
} elseif { [dict exists $v "terminator"] } {
${asyncprotocol} replyterminator "[dict get $v "terminator"]"
}
}
@@ -663,12 +684,9 @@ proc ::scobj::astrium_chopper::read_config {} {
if { [dict exists $v "timeout"] } {
${asyncqueue} timeout "[dict get $v "timeout"]"
}
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
if { [string equal -nocase ${asyncqueue} "sct"] } {
${ns}::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
} else {
${ns}::add_driver ${name} ${device_class} ${simulation_flag} "aqadapter" ${asyncqueue}
}
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}
}

64
site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
View File

@@ -218,6 +218,14 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
hsetprop ${scobj_hpath}/fast_shutter sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/fast_shutter type "part"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/fast_shutter 1
hsetprop ${scobj_hpath}/fast_shutter simulated false
} else {
::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
hsetprop ${scobj_hpath}/fast_shutter simulated true
}
hfactory ${scobj_hpath}/rough_100 plain user text
hsetprop ${scobj_hpath}/rough_100 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]}
hsetprop ${scobj_hpath}/rough_100 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -235,6 +243,15 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
hsetprop ${scobj_hpath}/rough_100 sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/rough_100 type "part"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/rough_100 1
${sct_controller} write ${scobj_hpath}/rough_100
hsetprop ${scobj_hpath}/rough_100 simulated false
} else {
::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
hsetprop ${scobj_hpath}/rough_100 simulated true
}
hfactory ${scobj_hpath}/rough_40 plain user text
hsetprop ${scobj_hpath}/rough_40 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[13], @IN[14]}
hsetprop ${scobj_hpath}/rough_40 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -252,20 +269,19 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
hsetprop ${scobj_hpath}/rough_40 sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/rough_40 type "part"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/rough_40 1
${sct_controller} write ${scobj_hpath}/rough_40
hsetprop ${scobj_hpath}/rough_40 simulated false
} else {
::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
hsetprop ${scobj_hpath}/rough_40 simulated true
}
hsetprop ${scobj_hpath} data "true"
hsetprop ${scobj_hpath} klass "@none"
hsetprop ${scobj_hpath} nxsave "true"
hsetprop ${scobj_hpath} type "part"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/fast_shutter 1
${sct_controller} poll ${scobj_hpath}/rough_100 1
${sct_controller} poll ${scobj_hpath}/rough_40 1
${sct_controller} write ${scobj_hpath}/rough_100
${sct_controller} write ${scobj_hpath}/rough_40
} else {
::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
}
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
@@ -287,7 +303,9 @@ proc ::scobj::shutters::add_driver {name device_class simulation_flag ip_address
makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port}
}
} else {
::scobj::shutters::sics_log 9 "simulation_flag={simulation_flag} => No sctcontroller for shutters"
::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for shutters"
::scobj::shutters::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL
}
::scobj::shutters::sics_log 1 "::scobj::shutters::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}"
::scobj::shutters::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
@@ -305,7 +323,7 @@ namespace eval ::scobj::shutters {
proc add_shutters {name ip_address tcp_port} {
set simulation_flag "[string tolower [SplitReply [motor_simulation]]]"
::scobj::shutters::add_driver ${name} "instrument" "${simulation_flag}" ${ip_address} ${tcp_port}
::scobj::shutters::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
}
clientput "file evaluation of sct_shutters.tcl"
@@ -344,20 +362,31 @@ proc ::scobj::shutters::read_config {} {
if { ![string equal -nocase "${simulation_flag}" "false"] } {
set asyncqueue "null"
${ns}::sics_log 9 "simulation_flag=${simulation_flag} => using null asyncqueue"
${ns}::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL
} elseif { [dict exists $v "asyncqueue"] } {
set asyncqueue [dict get $v "asyncqueue"]
if { [string equal -nocase ${asyncqueue} "sct"] } {
set ip_address [dict get $v ip]
set tcp_port [dict get $v port]
}
makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port}
} else {
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
} else {
if { [dict exists $v "asyncprotocol"] } {
set asyncprotocol [dict get $v "asyncprotocol"]
} else {
set asyncprotocol ${name}_protocol
MakeAsyncProtocol ${asyncprotocol}
if { [dict exists $v "terminator"] } {
if { [dict exists $v "sendterminator"] } {
${asyncprotocol} sendterminator "[dict get $v "sendterminator"]"
} elseif { [dict exists $v "terminator"] } {
${asyncprotocol} sendterminator "[dict get $v "terminator"]"
}
if { [dict exists $v "replyterminator"] } {
${asyncprotocol} replyterminator "[dict get $v "replyterminator"]"
} elseif { [dict exists $v "terminator"] } {
${asyncprotocol} replyterminator "[dict get $v "terminator"]"
}
}
@@ -368,12 +397,9 @@ proc ::scobj::shutters::read_config {} {
if { [dict exists $v "timeout"] } {
${asyncqueue} timeout "[dict get $v "timeout"]"
}
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
if { [string equal -nocase ${asyncqueue} "sct"] } {
${ns}::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
} else {
${ns}::add_driver ${name} ${device_class} ${simulation_flag} "aqadapter" ${asyncqueue}
}
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}
}

76
site_ansto/instrument/bilby/config/motors/sct_tank.tcl
View File

@@ -226,20 +226,19 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/pos type "part"
hsetprop ${scobj_hpath}/pos nxalias "${name}_pos"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/pos 1
hsetprop ${scobj_hpath}/pos simulated false
} else {
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
hsetprop ${scobj_hpath}/pos simulated true
}
hsetprop ${scobj_hpath} data "true"
hsetprop ${scobj_hpath} klass "@none"
hsetprop ${scobj_hpath} type "part"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/pos 1
} else {
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
}
hfactory ${scobj_hpath}/limits plain spy none
hsetprop ${scobj_hpath}/limits data "true"
hsetprop ${scobj_hpath}/limits klass "@none"
hsetprop ${scobj_hpath}/limits type "part"
hfactory ${scobj_hpath}/limits/forward plain user text
hsetprop ${scobj_hpath}/limits/forward read ${ns}::getValue ${scobj_hpath} read_switch {MG _LFH}
@@ -254,6 +253,14 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/limits/forward type "part"
hsetprop ${scobj_hpath}/limits/forward nxalias "${name}_limits_forward"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/limits/forward 1
hsetprop ${scobj_hpath}/limits/forward simulated false
} else {
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
hsetprop ${scobj_hpath}/limits/forward simulated true
}
hfactory ${scobj_hpath}/limits/reverse plain user text
hsetprop ${scobj_hpath}/limits/reverse read ${ns}::getValue ${scobj_hpath} read_switch {MG _LRH}
hsetprop ${scobj_hpath}/limits/reverse read_switch ${ns}::read_switch ${scobj_hpath}
@@ -268,16 +275,17 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/limits/reverse nxalias "${name}_limits_reverse"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/limits/forward 1
${sct_controller} poll ${scobj_hpath}/limits/reverse 1
hsetprop ${scobj_hpath}/limits/reverse simulated false
} else {
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
hsetprop ${scobj_hpath}/limits/reverse simulated true
}
hsetprop ${scobj_hpath}/limits data "true"
hsetprop ${scobj_hpath}/limits klass "@none"
hsetprop ${scobj_hpath}/limits type "part"
hfactory ${scobj_hpath}/switches plain spy none
hsetprop ${scobj_hpath}/switches data "true"
hsetprop ${scobj_hpath}/switches klass "@none"
hsetprop ${scobj_hpath}/switches type "part"
hfactory ${scobj_hpath}/switches/forward plain user text
hsetprop ${scobj_hpath}/switches/forward read ${ns}::getValue ${scobj_hpath} read_switch {MG @IN[5]}
@@ -292,6 +300,14 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/switches/forward type "part"
hsetprop ${scobj_hpath}/switches/forward nxalias "${name}_switches_forward"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/switches/forward 1
hsetprop ${scobj_hpath}/switches/forward simulated false
} else {
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
hsetprop ${scobj_hpath}/switches/forward simulated true
}
hfactory ${scobj_hpath}/switches/reverse plain user text
hsetprop ${scobj_hpath}/switches/reverse read ${ns}::getValue ${scobj_hpath} read_switch {MG @IN[6]}
hsetprop ${scobj_hpath}/switches/reverse read_switch ${ns}::read_switch ${scobj_hpath}
@@ -306,11 +322,15 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/switches/reverse nxalias "${name}_switches_reverse"
if {[string equal -nocase "${simulation_flag}" "false"]} {
${sct_controller} poll ${scobj_hpath}/switches/forward 1
${sct_controller} poll ${scobj_hpath}/switches/reverse 1
hsetprop ${scobj_hpath}/switches/reverse simulated false
} else {
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
hsetprop ${scobj_hpath}/switches/reverse simulated true
}
hsetprop ${scobj_hpath}/switches data "true"
hsetprop ${scobj_hpath}/switches klass "@none"
hsetprop ${scobj_hpath}/switches type "part"
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
@@ -335,7 +355,9 @@ proc ::scobj::tank::add_driver {name device_class simulation_flag ip_address tcp
makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port}
}
} else {
::scobj::tank::sics_log 9 "simulation_flag={simulation_flag} => No sctcontroller for tank"
::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for tank"
::scobj::tank::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL
}
::scobj::tank::sics_log 1 "::scobj::tank::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}"
::scobj::tank::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
@@ -353,7 +375,7 @@ namespace eval ::scobj::tank {
proc add_tank {name ip_address tcp_port} {
set simulation_flag "[string tolower [SplitReply [motor_simulation]]]"
::scobj::tank::add_driver ${name} "instrument" "${simulation_flag}" ${ip_address} ${tcp_port}
::scobj::tank::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
}
clientput "file evaluation of sct_tank.tcl"
@@ -392,20 +414,31 @@ proc ::scobj::tank::read_config {} {
if { ![string equal -nocase "${simulation_flag}" "false"] } {
set asyncqueue "null"
${ns}::sics_log 9 "simulation_flag=${simulation_flag} => using null asyncqueue"
${ns}::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL"
makesctcontroller sct_${name} aqadapter NULL
} elseif { [dict exists $v "asyncqueue"] } {
set asyncqueue [dict get $v "asyncqueue"]
if { [string equal -nocase ${asyncqueue} "sct"] } {
set ip_address [dict get $v ip]
set tcp_port [dict get $v port]
}
makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port}
} else {
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
} else {
if { [dict exists $v "asyncprotocol"] } {
set asyncprotocol [dict get $v "asyncprotocol"]
} else {
set asyncprotocol ${name}_protocol
MakeAsyncProtocol ${asyncprotocol}
if { [dict exists $v "terminator"] } {
if { [dict exists $v "sendterminator"] } {
${asyncprotocol} sendterminator "[dict get $v "sendterminator"]"
} elseif { [dict exists $v "terminator"] } {
${asyncprotocol} sendterminator "[dict get $v "terminator"]"
}
if { [dict exists $v "replyterminator"] } {
${asyncprotocol} replyterminator "[dict get $v "replyterminator"]"
} elseif { [dict exists $v "terminator"] } {
${asyncprotocol} replyterminator "[dict get $v "terminator"]"
}
}
@@ -416,12 +449,9 @@ proc ::scobj::tank::read_config {} {
if { [dict exists $v "timeout"] } {
${asyncqueue} timeout "[dict get $v "timeout"]"
}
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
if { [string equal -nocase ${asyncqueue} "sct"] } {
${ns}::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
} else {
${ns}::add_driver ${name} ${device_class} ${simulation_flag} "aqadapter" ${asyncqueue}
}
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}
}