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

SICS-696 Explicity include the namespace on mk_sct_ calls

Browse Source
This commit is contained in:
Douglas Clowes
2014-07-23 14:32:26 +10:00
parent 16b435befe
commit e3b583150e
17 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/config/environment/magneticField/sct_bruker_BEC1.tcl
View File

@ -1360,7 +1360,7 @@ proc add_bruker_bec1 {name IP port {_tol 0.1} {CID 1} {CTYPE B} } {
# Command terminator for Bruker unit is always carriage return without linefeed '\r'
makesctcontroller sct_bruker_BEC1_$name astvelsel ${IP}:$port "\r"
# proc mk_sct_bruker_BEC1 (sct_controller klasse tempobj tol)
mk_sct_bruker_BEC1 sct_bruker_BEC1_$name environment $name $_tol $CID $CTYPE
::scobj::bruker_BEC1::mk_sct_bruker_BEC1 sct_bruker_BEC1_$name environment $name $_tol $CID $CTYPE
makesctemon $name /sics/$name/emon/mon_mode /sics/$name/emon/is_in_tolerance /sics/$name/emon/errhandler
} message ]
handle_exception $catch_status $message "In subroutine add_bruker_bec1()."

4
site_ansto/instrument/config/environment/magneticField/sct_lakeshore_460.tcl
View File

@ -458,8 +458,8 @@ proc add_ls460 {name IP port terminator {_tol 5.0}} {
puts $fd "makesctcontroller sct_ls460 std ${IP}:$port"
makesctcontroller sct_ls460 std ${IP}:$port $terminator
}
puts $fd "mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol"
mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol
puts $fd "::scobj::ls460::mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol"
::scobj::ls460::mk_sct_lakeshore_ls460 sct_ls460 environment $name $_tol
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

4
site_ansto/instrument/config/environment/magneticField/sct_oxford_ips.tcl
View File

@ -749,8 +749,8 @@ proc add_ips120 {name IP port {_tol 5.0}} {
puts $fd "makesctcontroller sct_ips120 oxford ${IP}:$port"
makesctcontroller sct_ips120 oxford ${IP}:$port
}
puts $fd "mk_sct_oxford_ips120 sct_ips120 environment $name $_tol"
mk_sct_oxford_ips120 sct_ips120 environment $name $_tol
puts $fd "::scobj::ips120::mk_sct_oxford_ips120 sct_ips120 environment $name $_tol"
::scobj::ips120::mk_sct_oxford_ips120 sct_ips120 environment $name $_tol
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

4
site_ansto/instrument/config/environment/sct_autolab.tcl
View File

@ -408,8 +408,8 @@ proc add_autolab {name IP port } {
if {[SplitReply [environment_simulation]]=="false"} {
makesctcontroller sct_autolab std ${IP}:$port [binary format cc 0x0D 0x0A] 5.0
}
puts $fd "mk_sct_autolab sct_autolab environment $name"
mk_sct_autolab sct_autolab environment $name
puts $fd "::scobj::autolab::mk_sct_autolab sct_autolab environment $name"
::scobj::autolab::mk_sct_autolab sct_autolab environment $name
close $fd
}

4
site_ansto/instrument/config/environment/sct_cybaman.tcl
View File

@ -1127,8 +1127,8 @@ proc add_cybaman {name IP port terminator {_tol 1.0}} {
puts $fd "makesctcontroller sct_cybaman std ${IP}:$port"
makesctcontroller sct_cybaman std ${IP}:$port $terminator
}
puts $fd "mk_sct_cybaman sct_cybaman environment $name $_tol"
mk_sct_cybaman sct_cybaman environment $name $_tol
puts $fd "::scobj::cybaman::mk_sct_cybaman sct_cybaman environment $name $_tol"
::scobj::cybaman::mk_sct_cybaman sct_cybaman environment $name $_tol
close $fd
}

4
site_ansto/instrument/config/environment/sct_keithley_2700.tcl
View File

@ -669,8 +669,8 @@ proc add_keithley_2700 {name IP port terminator {_tol 1.0} {CID 1} {CTYPE V} } {
puts $fd "makesctcontroller sct_k2700 std ${IP}:$port"
makesctcontroller sct_k2700 std ${IP}:$port $terminator
}
puts $fd "mk_sct_keithley_2700 sct_k2700 environment $name $_tol"
mk_sct_keithley_2700 sct_k2700 environment $name $_tol $CID $CTYPE
puts $fd "::scobj::k2700::mk_sct_keithley_2700 sct_k2700 environment $name $_tol"
::scobj::k2700::mk_sct_keithley_2700 sct_k2700 environment $name $_tol $CID $CTYPE
close $fd
}

4
site_ansto/instrument/config/environment/sct_mvp.tcl
View File

@ -513,8 +513,8 @@ proc add_mvp {name IP port dev} {
if {[SplitReply [environment_simulation]]=="false"} {
makesctcontroller sct_mvp hamilton ${IP}:$port "\r"
}
puts $fd "mk_sct_mvp sct_mvp environment $name"
mk_sct_mvp sct_mvp environment $name $dev
puts $fd "::scobj::mvp::mk_sct_mvp sct_mvp environment $name"
::scobj::mvp::mk_sct_mvp sct_mvp environment $name $dev
close $fd
}

4
site_ansto/instrument/config/environment/sct_syr.tcl
View File

@ -614,8 +614,8 @@ proc add_syr {name IP port} {
if {[SplitReply [environment_simulation]]=="false"} {
makesctcontroller sct_syr syringe ${IP}:$port "\r"
}
puts $fd "mk_sct_syr sct_syr environment $name"
mk_sct_syr sct_syr environment $name
puts $fd "::scobj::syr::mk_sct_syr sct_syr environment $name"
::scobj::syr::mk_sct_syr sct_syr environment $name
close $fd
}

4
site_ansto/instrument/config/environment/temperature/sct_eurotherm_2000.tcl
View File

@ -353,8 +353,8 @@ proc add_eurotherm_2000 {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} {
puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port"
makesctcontroller sct_${name} modbus ${IP}:$port
}
puts $fd "mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol"
mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "::scobj::et2000::mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol"
::scobj::et2000::mk_sct_eurotherm_et2000 sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

2
site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl
View File

@ -424,7 +424,7 @@ proc add_julabo_lh45 { name IP port {sensor "bath"} {_tol 5.0} {CID 1} {CTYPE T}
makesctcontroller sct_${name} std ${IP}:$port "\r"
}
}
mk_sct_julabo_lh45 sct_${name} environment $name $_tol $CID $CTYPE
::scobj::lh45::mk_sct_julabo_lh45 sct_${name} environment $name $_tol $CID $CTYPE
set scobj_hpath /sics/$name
switch $sensor {
"bath" {

4
site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl
View File

@ -915,8 +915,8 @@ namespace eval ::scobj::[set vendor]_[set device] {
makesctcontroller sct_ls370_$name std ${IP}:$port $terminator
}
}
debug_log 1 "mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}"
mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}
debug_log 1 "::scobj::[set vendor]_[set device]::mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}"
::scobj::[set vendor]_[set device]::mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}
}

4
site_ansto/instrument/config/environment/temperature/sct_oxford_itc.tcl
View File

@ -530,8 +530,8 @@ proc add_itc500 {name IP port {_tol 5.0} {addr "@1"} } {
puts $fd "makesctcontroller sct_itc500 oxford ${IP}:$port \"\r\""
makesctcontroller sct_itc500 oxford ${IP}:$port "\r"
}
puts $fd "mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr"
mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr
puts $fd "::scobj::itc500::mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr"
::scobj::itc500::mk_sct_oxford_itc500 sct_itc500 environment $name $_tol $addr
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

4
site_ansto/instrument/config/environment/temperature/sct_qlink.tcl
View File

@ -120,8 +120,8 @@ proc add_qlink {name IP port {_tol 5.0}} {
puts $fd "makesctcontroller sct_qlink std ${IP}:$port"
makesctcontroller sct_qlink std ${IP}:$port
}
puts $fd "mk_sct_qlink sct_qlink environment $name $_tol"
mk_sct_qlink sct_qlink environment $name $_tol
puts $fd "::scobj::qlink::mk_sct_qlink sct_qlink environment $name $_tol"
::scobj::qlink::mk_sct_qlink sct_qlink environment $name $_tol
close $fd
}

4
site_ansto/instrument/config/environment/temperature/sct_watlow_pm.tcl
View File

@ -527,8 +527,8 @@ proc add_watlow_pm {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} {
puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port"
makesctcontroller sct_${name} modbus ${IP}:$port
}
puts $fd "mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol"
mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "::scobj::watlow_pm::mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol"
::scobj::watlow_pm::mk_sct_watlow_pm sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

4
site_ansto/instrument/config/environment/temperature/sct_watlow_rm.tcl
View File

@ -557,8 +557,8 @@ proc add_watlow_rm {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} {
puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port"
makesctcontroller sct_${name} modbus ${IP}:$port
}
puts $fd "mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol"
mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "::scobj::watlow_rm::mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol"
::scobj::watlow_rm::mk_sct_watlow_rm sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

4
site_ansto/instrument/config/environment/temperature/sct_watlow_st4.tcl
View File

@ -768,8 +768,8 @@ proc add_watlow_st4 {name IP port dev_id {_tol 5.0} {CID 1} {CTYPE T}} {
puts $fd "makesctcontroller sct_${name} modbus ${IP}:$port"
makesctcontroller sct_${name} modbus ${IP}:$port
}
puts $fd "mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol"
mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "::scobj::watlow_st::mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol"
::scobj::watlow_st::mk_sct_watlow_st sct_${name} environment $name $dev_id $_tol $CID $CTYPE
puts $fd "makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler"
makesctemon $name /sics/$name/emon/monmode /sics/$name/emon/isintol /sics/$name/emon/errhandler
close $fd

4
site_ansto/instrument/config/robots/sct_pickandplace.tcl
View File

@ -477,8 +477,8 @@ proc add_robot {name IP port } {
puts $fd "makesctcontroller sct_robot_pp std ${IP}:$port"
makesctcontroller sct_robot_pp std ${IP}:$port [binary format cc 0x0D 0x0A] 5.0
}
puts $fd "mk_sct_robot_pp sct_robot environment $name"
mk_sct_robot_pp sct_robot_pp environment $name
puts $fd "::scobj::robot_pp::mk_sct_robot_pp sct_robot environment $name"
::scobj::robot_pp::mk_sct_robot_pp sct_robot_pp environment $name
close $fd
}