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

Set the driver name and the ip_address/tcp_port for nosctcontroller

Browse Source
This commit is contained in:
Douglas Clowes
2014-11-27 15:15:13 +11:00
parent 99f23cda50
commit 34f748e426
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/util/gen_sct.py
View File

@ -1628,6 +1628,7 @@ def put_mkDriver(MyDriver):
ms_line = ' MakeSICSObj ${name} SCT_OBJECT' ms_line = ' MakeSICSObj ${name} SCT_OBJECT'
txt += [ms_line] txt += [ms_line]
txt += [''] txt += ['']
txt += [' sicslist setatt ${name} driver %s' % MyDriver['name']]
txt += [' sicslist setatt ${name} klass ${device_class}'] txt += [' sicslist setatt ${name} klass ${device_class}']
txt += [' sicslist setatt ${name} long_name ${name}'] txt += [' sicslist setatt ${name} long_name ${name}']
if 'DriverProperty' in MyDriver: if 'DriverProperty' in MyDriver:
@ -1639,6 +1640,7 @@ def put_mkDriver(MyDriver):
for group in sorted(MyDriver['Groups']): for group in sorted(MyDriver['Groups']):
txt += put_group(MyDriver, MyDriver['Groups'][group]) txt += put_group(MyDriver, MyDriver['Groups'][group])
txt += [' hsetprop ${scobj_hpath} driver %s' % MyDriver['name']]
txt += [' hsetprop ${scobj_hpath} klass ${device_class}'] txt += [' hsetprop ${scobj_hpath} klass ${device_class}']
txt += [' hsetprop ${scobj_hpath} data true'] txt += [' hsetprop ${scobj_hpath} data true']
txt += [' hsetprop ${scobj_hpath} debug_threshold %s' % str(MyDriver['debug_threshold'])] txt += [' hsetprop ${scobj_hpath} debug_threshold %s' % str(MyDriver['debug_threshold'])]
@ -1785,6 +1787,8 @@ def put_read_config(MyDriver):
txt += [' if { [string equal -nocase [dict get $v "driver"] "%s"] } {' % MyDriver['name']] txt += [' if { [string equal -nocase [dict get $v "driver"] "%s"] } {' % MyDriver['name']]
if ('WrapperProperty' in MyDriver) and ('nosctcontroller' in MyDriver['WrapperProperty']): if ('WrapperProperty' in MyDriver) and ('nosctcontroller' in MyDriver['WrapperProperty']):
txt += [' %s::sics_log 9 "No sctcontroller for %s"' % (MyDriver['namespace'], MyDriver['name'])] txt += [' %s::sics_log 9 "No sctcontroller for %s"' % (MyDriver['namespace'], MyDriver['name'])]
txt += [' set ip_address [dict get $v ip]']
txt += [' set tcp_port [dict get $v port]']
else: else:
txt += [' if { ![string equal -nocase "${simulation_flag}" "false"] } {'] txt += [' if { ![string equal -nocase "${simulation_flag}" "false"] } {']
txt += [' set asyncqueue "null"'] txt += [' set asyncqueue "null"']