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

Change SCT wrappers to use ip_address and tcp_port

Browse Source
This commit is contained in:
Douglas Clowes
2014-08-19 11:27:43 +10:00
parent 04a87e5ff2
commit 6f5892f07d
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site_ansto/instrument/config/environment/agilent_33220A.sct
View File

@ -1,8 +1,11 @@
# vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent
driver agilent_33220A = { driver agilent_33220A = {
wrapper_property nosctcontroller = True
protocol = std protocol = std
class = environment class = environment
simulation_group = environment_simulation simulation_group = environment_simulation
code mkWrapper = {%% code mkWrapper = {%%
${ns}::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}"
makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
%%} %%}
} }

4
site_ansto/instrument/config/environment/magneticField/green_magnet_labview.sct
View File

@ -9,8 +9,8 @@ driver green_magnet_labview = {
# TCL code # TCL code
::scobj::green::mkGreen { ::scobj::green::mkGreen {
name "green_magnet" name "green_magnet"
IP 137.157.201.88 IP ${ip_address}
PORT 5001 PORT ${tcp_port}
tuning 1 tuning 1
interval 3 interval 3
} }

7
site_ansto/instrument/config/environment/temperature/west4100.sct
View File

@ -3,9 +3,10 @@ driver west4100 = {
protocol = std protocol = std
class = environment class = environment
simulation_group = environment_simulation simulation_group = environment_simulation
wrapper_property nosctcontroller = True
add_args = 'dev_id' add_args = 'dev_id'
make_args = 'IP dev_id' make_args = 'dev_id'
code mkDriver = {%% code mkWrapper = {%%
::environment::temperature::mkwest400 $name $IP $dev_id ::environment::temperature::mkwest400 ${name} ${ip_address} ${dev_id}
%%} %%}
} }