Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions

View File

@@ -8,7 +8,7 @@ namespace eval ::scobj::et2000 {
# /tempcont/setpoint
# /tempcont/sensor/value
proc debug_log {args} {
set fd [open "/home/dcl/et2000.log" a]
set fd [open "/tmp/et2000.log" a]
puts $fd $args
close $fd
}
@@ -317,6 +317,7 @@ debug_log "halt $tc_root"
hsetprop $scobj_hpath privilege spy
::scobj::hinitprops $tempobj setpoint
hsetprop $scobj_hpath/setpoint data true
if {[SplitReply [environment_simulation]]=="false"} {
ansto_makesctdrive ${tempobj}_driveable $scobj_hpath/setpoint $scobj_hpath/sensor/value $sct_controller
}
@@ -335,7 +336,7 @@ debug_log "halt $tc_root"
# @param port, the IP protocol port number of the device (502 for modbus)
# @param _tol (optional), this is the initial tolerance setting
proc add_et2000 {name IP port dev_id {_tol 5.0}} {
set fd [open "/home/dcl/et2000.log" a]
set fd [open "/tmp/et2000.log" a]
if {[SplitReply [environment_simulation]]=="false"} {
puts $fd "makesctcontroller sct_et2000 modbus ${IP}:$port"
makesctcontroller sct_et2000 modbus ${IP}:$port
@@ -348,11 +349,11 @@ proc add_et2000 {name IP port dev_id {_tol 5.0}} {
}
puts stdout "file evaluation of sct_eurotherm_2000.tcl"
set fd [open "/home/dcl/et2000.log" w]
set fd [open "/tmp/et2000.log" w]
puts $fd "file evaluation of sct_eurotherm_2000.tcl"
close $fd
namespace import ::scobj::et2000::*
add_et2000 et2000 137.157.201.213 502 1 5
#add_et2000 et2000 137.157.201.213 502 1 5
#add_et2000 et2000 localhost 30502 1 5