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

Added ::plc::inst_ready command which is used to check if the instrument is ready before starting a scan.

Browse Source 
Also add plc simulation mode

r2202 | ffr | 2007-10-31 15:54:49 +1100 (Wed, 31 Oct 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-10-31 15:54:49 +11:00
committed by Douglas Clowes
parent 33e93c6d3d
commit f54146b58e
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
site_ansto/instrument/config/plc/plc_common_1.tcl
View File

@@ -1,5 +1,9 @@
set sim_mode [SplitReply [plc_simulation]]
namespace eval plc { namespace eval plc {
proc set_sobj_attributes {} { }
proc ::plc::set_sobj_attributes {} {
set objlist [sicslist match plc_*]; set objlist [sicslist match plc_*];
foreach v $objlist { foreach v $objlist {
if { [SplitReply [sicslist $v type]]== "SicsVariable"} { if { [SplitReply [sicslist $v type]]== "SicsVariable"} {
@@ -7,4 +11,28 @@ namespace eval plc {
} }
} }
} }
if {$sim_mode == "true"} {
proc ::plc::inst_ready {} {
variable readyflag
return $readyflag
}
proc ::plc::set_readyflag {flag} {
variable readyflag
set readyflag $flag
}
::plc::set_readyflag 1
publish ::plc::set_readyflag user
} else {
##
# @brief Check if instrument is ready
#
# @return 1: if ready, 0: if not ready
proc ::plc::inst_ready {} {
if {[SplitReply [plc plc_ready]] == "True"} {
return 1
} else {
return 0
}
}
} }

10
site_ansto/instrument/server_config.tcl
View File

@@ -1,7 +1,7 @@
# SICS common configuration # SICS common configuration
# $Revision: 1.30 $ # $Revision: 1.31 $
# $Date: 2007-10-23 02:42:52 $ # $Date: 2007-10-31 04:54:49 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: ffr $ # Last revision by $Author: ffr $
@@ -57,7 +57,7 @@ sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_release lock sics_release lock
::utility::mkVar sics_revision_num Text internal ::utility::mkVar sics_revision_num Text internal
set tmpstr [string map {"$" ""} {$Revision: 1.30 $}] set tmpstr [string map {"$" ""} {$Revision: 1.31 $}]
sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_revision_num lock sics_revision_num lock
@@ -92,6 +92,9 @@ motor_simulation false
::utility::mkVar chopper_simulation Text internal ::utility::mkVar chopper_simulation Text internal
chopper_simulation false chopper_simulation false
::utility::mkVar plc_simulation Text internal
plc_simulation false
::utility::mkVar sics_fullsimulation Text internal ::utility::mkVar sics_fullsimulation Text internal
sics_fullsimulation false sics_fullsimulation false
@@ -100,6 +103,7 @@ if {[SplitReply [sics_fullsimulation]] == "true"} {
counter_simulation true counter_simulation true
motor_simulation true motor_simulation true
chopper_simulation true chopper_simulation true
plc_simulation true
} }
proc server_set_sobj_attributes {} { proc server_set_sobj_attributes {} {