Regenerate SCT drivers

This commit is contained in:
Douglas Clowes
2014-11-13 12:35:46 +11:00
parent 4b9ed0bf7f
commit 3450b4cbf9
42 changed files with 140 additions and 486 deletions

View File

@@ -250,10 +250,8 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
set scobj_hpath /sics/${name}
# Start of named group: disk_1
hfactory ${scobj_hpath}/disk_1 plain spy none
# Start of var: aphase
hfactory ${scobj_hpath}/disk_1/aphase plain user float
hsetprop ${scobj_hpath}/disk_1/aphase control true
hsetprop ${scobj_hpath}/disk_1/aphase data true
@@ -265,7 +263,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1/aphase type "part"
hsetprop ${scobj_hpath}/disk_1/aphase nxalias "${name}_disk_1_aphase"
# Start of var: aspeed
hfactory ${scobj_hpath}/disk_1/aspeed plain user float
hsetprop ${scobj_hpath}/disk_1/aspeed control true
hsetprop ${scobj_hpath}/disk_1/aspeed data true
@@ -277,7 +274,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1/aspeed type "part"
hsetprop ${scobj_hpath}/disk_1/aspeed nxalias "${name}_disk_1_aspeed"
# Start of var: frequency
hfactory ${scobj_hpath}/disk_1/frequency plain user float
hsetprop ${scobj_hpath}/disk_1/frequency control true
hsetprop ${scobj_hpath}/disk_1/frequency data true
@@ -289,7 +285,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1/frequency type "part"
hsetprop ${scobj_hpath}/disk_1/frequency nxalias "${name}_disk_1_frequency"
# Start of var: master
hfactory ${scobj_hpath}/disk_1/master plain user text
hsetprop ${scobj_hpath}/disk_1/master control true
hsetprop ${scobj_hpath}/disk_1/master data true
@@ -301,7 +296,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1/master type "part"
hsetprop ${scobj_hpath}/disk_1/master nxalias "${name}_disk_1_master"
# Start of var: rphase
hfactory ${scobj_hpath}/disk_1/rphase plain user float
hsetprop ${scobj_hpath}/disk_1/rphase control true
hsetprop ${scobj_hpath}/disk_1/rphase data true
@@ -313,7 +307,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1/rphase type "part"
hsetprop ${scobj_hpath}/disk_1/rphase nxalias "${name}_disk_1_rphase"
# Start of var: rspeed
hfactory ${scobj_hpath}/disk_1/rspeed plain user float
hsetprop ${scobj_hpath}/disk_1/rspeed control true
hsetprop ${scobj_hpath}/disk_1/rspeed data true
@@ -325,7 +318,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1/rspeed type "part"
hsetprop ${scobj_hpath}/disk_1/rspeed nxalias "${name}_disk_1_rspeed"
# Start of var: state
hfactory ${scobj_hpath}/disk_1/state plain user text
hsetprop ${scobj_hpath}/disk_1/state read ${ns}::fetchState ${scobj_hpath} readState {1}
hsetprop ${scobj_hpath}/disk_1/state readState ${ns}::readState ${scobj_hpath}
@@ -350,12 +342,9 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_1 data "true"
hsetprop ${scobj_hpath}/disk_1 klass "@none"
hsetprop ${scobj_hpath}/disk_1 type "part"
# End of named group: disk_1
# Start of named group: disk_2
hfactory ${scobj_hpath}/disk_2 plain spy none
# Start of var: aphase
hfactory ${scobj_hpath}/disk_2/aphase plain user float
hsetprop ${scobj_hpath}/disk_2/aphase control true
hsetprop ${scobj_hpath}/disk_2/aphase data true
@@ -367,7 +356,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2/aphase type "part"
hsetprop ${scobj_hpath}/disk_2/aphase nxalias "${name}_disk_2_aphase"
# Start of var: aspeed
hfactory ${scobj_hpath}/disk_2/aspeed plain user float
hsetprop ${scobj_hpath}/disk_2/aspeed control true
hsetprop ${scobj_hpath}/disk_2/aspeed data true
@@ -379,7 +367,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2/aspeed type "part"
hsetprop ${scobj_hpath}/disk_2/aspeed nxalias "${name}_disk_2_aspeed"
# Start of var: frequency
hfactory ${scobj_hpath}/disk_2/frequency plain user float
hsetprop ${scobj_hpath}/disk_2/frequency control true
hsetprop ${scobj_hpath}/disk_2/frequency data true
@@ -391,7 +378,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2/frequency type "part"
hsetprop ${scobj_hpath}/disk_2/frequency nxalias "${name}_disk_2_frequency"
# Start of var: master
hfactory ${scobj_hpath}/disk_2/master plain user text
hsetprop ${scobj_hpath}/disk_2/master control true
hsetprop ${scobj_hpath}/disk_2/master data true
@@ -403,7 +389,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2/master type "part"
hsetprop ${scobj_hpath}/disk_2/master nxalias "${name}_disk_2_master"
# Start of var: rphase
hfactory ${scobj_hpath}/disk_2/rphase plain user float
hsetprop ${scobj_hpath}/disk_2/rphase control true
hsetprop ${scobj_hpath}/disk_2/rphase data true
@@ -415,7 +400,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2/rphase type "part"
hsetprop ${scobj_hpath}/disk_2/rphase nxalias "${name}_disk_2_rphase"
# Start of var: rspeed
hfactory ${scobj_hpath}/disk_2/rspeed plain user float
hsetprop ${scobj_hpath}/disk_2/rspeed control true
hsetprop ${scobj_hpath}/disk_2/rspeed data true
@@ -427,7 +411,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2/rspeed type "part"
hsetprop ${scobj_hpath}/disk_2/rspeed nxalias "${name}_disk_2_rspeed"
# Start of var: state
hfactory ${scobj_hpath}/disk_2/state plain user text
hsetprop ${scobj_hpath}/disk_2/state read ${ns}::fetchState ${scobj_hpath} readState {2}
hsetprop ${scobj_hpath}/disk_2/state readState ${ns}::readState ${scobj_hpath}
@@ -452,12 +435,9 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_2 data "true"
hsetprop ${scobj_hpath}/disk_2 klass "@none"
hsetprop ${scobj_hpath}/disk_2 type "part"
# End of named group: disk_2
# Start of named group: disk_3
hfactory ${scobj_hpath}/disk_3 plain spy none
# Start of var: aphase
hfactory ${scobj_hpath}/disk_3/aphase plain user float
hsetprop ${scobj_hpath}/disk_3/aphase control true
hsetprop ${scobj_hpath}/disk_3/aphase data true
@@ -469,7 +449,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3/aphase type "part"
hsetprop ${scobj_hpath}/disk_3/aphase nxalias "${name}_disk_3_aphase"
# Start of var: aspeed
hfactory ${scobj_hpath}/disk_3/aspeed plain user float
hsetprop ${scobj_hpath}/disk_3/aspeed control true
hsetprop ${scobj_hpath}/disk_3/aspeed data true
@@ -481,7 +460,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3/aspeed type "part"
hsetprop ${scobj_hpath}/disk_3/aspeed nxalias "${name}_disk_3_aspeed"
# Start of var: frequency
hfactory ${scobj_hpath}/disk_3/frequency plain user float
hsetprop ${scobj_hpath}/disk_3/frequency control true
hsetprop ${scobj_hpath}/disk_3/frequency data true
@@ -493,7 +471,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3/frequency type "part"
hsetprop ${scobj_hpath}/disk_3/frequency nxalias "${name}_disk_3_frequency"
# Start of var: master
hfactory ${scobj_hpath}/disk_3/master plain user text
hsetprop ${scobj_hpath}/disk_3/master control true
hsetprop ${scobj_hpath}/disk_3/master data true
@@ -505,7 +482,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3/master type "part"
hsetprop ${scobj_hpath}/disk_3/master nxalias "${name}_disk_3_master"
# Start of var: rphase
hfactory ${scobj_hpath}/disk_3/rphase plain user float
hsetprop ${scobj_hpath}/disk_3/rphase control true
hsetprop ${scobj_hpath}/disk_3/rphase data true
@@ -517,7 +493,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3/rphase type "part"
hsetprop ${scobj_hpath}/disk_3/rphase nxalias "${name}_disk_3_rphase"
# Start of var: rspeed
hfactory ${scobj_hpath}/disk_3/rspeed plain user float
hsetprop ${scobj_hpath}/disk_3/rspeed control true
hsetprop ${scobj_hpath}/disk_3/rspeed data true
@@ -529,7 +504,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3/rspeed type "part"
hsetprop ${scobj_hpath}/disk_3/rspeed nxalias "${name}_disk_3_rspeed"
# Start of var: state
hfactory ${scobj_hpath}/disk_3/state plain user text
hsetprop ${scobj_hpath}/disk_3/state read ${ns}::fetchState ${scobj_hpath} readState {3}
hsetprop ${scobj_hpath}/disk_3/state readState ${ns}::readState ${scobj_hpath}
@@ -554,12 +528,9 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_3 data "true"
hsetprop ${scobj_hpath}/disk_3 klass "@none"
hsetprop ${scobj_hpath}/disk_3 type "part"
# End of named group: disk_3
# Start of named group: disk_4
hfactory ${scobj_hpath}/disk_4 plain spy none
# Start of var: aphase
hfactory ${scobj_hpath}/disk_4/aphase plain user float
hsetprop ${scobj_hpath}/disk_4/aphase control true
hsetprop ${scobj_hpath}/disk_4/aphase data true
@@ -571,7 +542,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4/aphase type "part"
hsetprop ${scobj_hpath}/disk_4/aphase nxalias "${name}_disk_4_aphase"
# Start of var: aspeed
hfactory ${scobj_hpath}/disk_4/aspeed plain user float
hsetprop ${scobj_hpath}/disk_4/aspeed control true
hsetprop ${scobj_hpath}/disk_4/aspeed data true
@@ -583,7 +553,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4/aspeed type "part"
hsetprop ${scobj_hpath}/disk_4/aspeed nxalias "${name}_disk_4_aspeed"
# Start of var: frequency
hfactory ${scobj_hpath}/disk_4/frequency plain user float
hsetprop ${scobj_hpath}/disk_4/frequency control true
hsetprop ${scobj_hpath}/disk_4/frequency data true
@@ -595,7 +564,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4/frequency type "part"
hsetprop ${scobj_hpath}/disk_4/frequency nxalias "${name}_disk_4_frequency"
# Start of var: master
hfactory ${scobj_hpath}/disk_4/master plain user text
hsetprop ${scobj_hpath}/disk_4/master control true
hsetprop ${scobj_hpath}/disk_4/master data true
@@ -607,7 +575,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4/master type "part"
hsetprop ${scobj_hpath}/disk_4/master nxalias "${name}_disk_4_master"
# Start of var: rphase
hfactory ${scobj_hpath}/disk_4/rphase plain user float
hsetprop ${scobj_hpath}/disk_4/rphase control true
hsetprop ${scobj_hpath}/disk_4/rphase data true
@@ -619,7 +586,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4/rphase type "part"
hsetprop ${scobj_hpath}/disk_4/rphase nxalias "${name}_disk_4_rphase"
# Start of var: rspeed
hfactory ${scobj_hpath}/disk_4/rspeed plain user float
hsetprop ${scobj_hpath}/disk_4/rspeed control true
hsetprop ${scobj_hpath}/disk_4/rspeed data true
@@ -631,7 +597,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4/rspeed type "part"
hsetprop ${scobj_hpath}/disk_4/rspeed nxalias "${name}_disk_4_rspeed"
# Start of var: state
hfactory ${scobj_hpath}/disk_4/state plain user text
hsetprop ${scobj_hpath}/disk_4/state read ${ns}::fetchState ${scobj_hpath} readState {4}
hsetprop ${scobj_hpath}/disk_4/state readState ${ns}::readState ${scobj_hpath}
@@ -656,7 +621,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4 data "true"
hsetprop ${scobj_hpath}/disk_4 klass "@none"
hsetprop ${scobj_hpath}/disk_4 type "part"
# End of named group: disk_4
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
@@ -701,8 +665,8 @@ proc add_astrium_chopper {name ip_address tcp_port} {
::scobj::astrium_chopper::add_driver ${name} "NXdisk_chopper" ${simulation_flag} ${ip_address} ${tcp_port}
}
clientput "file evaluation of sct_astrium_chopper.tcl"
::scobj::astrium_chopper::sics_log 9 "file evaluation of sct_astrium_chopper.tcl"
clientput "file evaluation of astrium_chopper_sct.tcl"
::scobj::astrium_chopper::sics_log 9 "file evaluation of astrium_chopper_sct.tcl"
proc ::scobj::astrium_chopper::read_config {} {
set catch_status [ catch {
@@ -774,7 +738,7 @@ proc ::scobj::astrium_chopper::read_config {} {
}
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}
}

View File

@@ -204,9 +204,7 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
sicslist setatt ${name} long_name ${name}
set scobj_hpath /sics/${name}
# Start of unnamed group
# Start of var: fast_shutter
hfactory ${scobj_hpath}/fast_shutter plain user text
hsetprop ${scobj_hpath}/fast_shutter read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[5], @IN[6]}
hsetprop ${scobj_hpath}/fast_shutter read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -228,7 +226,6 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
hsetprop ${scobj_hpath}/fast_shutter simulated true
}
# Start of var: rough_100
hfactory ${scobj_hpath}/rough_100 plain user text
hsetprop ${scobj_hpath}/rough_100 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]}
hsetprop ${scobj_hpath}/rough_100 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -255,7 +252,6 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
hsetprop ${scobj_hpath}/rough_100 simulated true
}
# Start of var: rough_40
hfactory ${scobj_hpath}/rough_40 plain user text
hsetprop ${scobj_hpath}/rough_40 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[13], @IN[14]}
hsetprop ${scobj_hpath}/rough_40 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -286,7 +282,6 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
hsetprop ${scobj_hpath} klass "@none"
hsetprop ${scobj_hpath} nxsave "true"
hsetprop ${scobj_hpath} type "part"
# End of unnamed group
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
@@ -331,8 +326,8 @@ proc add_shutters {name ip_address tcp_port} {
::scobj::shutters::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
}
clientput "file evaluation of sct_shutters.tcl"
::scobj::shutters::sics_log 9 "file evaluation of sct_shutters.tcl"
clientput "file evaluation of shutters_sct.tcl"
::scobj::shutters::sics_log 9 "file evaluation of shutters_sct.tcl"
proc ::scobj::shutters::read_config {} {
set catch_status [ catch {
@@ -404,7 +399,7 @@ proc ::scobj::shutters::read_config {} {
}
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}
}

View File

@@ -212,9 +212,7 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
sicslist setatt ${name} long_name ${name}
set scobj_hpath /sics/${name}
# Start of unnamed group
# Start of var: pos
hfactory ${scobj_hpath}/pos plain spy float
hsetprop ${scobj_hpath}/pos read ${ns}::getValue ${scobj_hpath} read_pos {MG _TPH}
hsetprop ${scobj_hpath}/pos read_pos ${ns}::read_pos ${scobj_hpath}
@@ -239,12 +237,9 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath} data "true"
hsetprop ${scobj_hpath} klass "@none"
hsetprop ${scobj_hpath} type "part"
# End of unnamed group
# Start of named group: limits
hfactory ${scobj_hpath}/limits plain spy none
# Start of var: forward
hfactory ${scobj_hpath}/limits/forward plain user text
hsetprop ${scobj_hpath}/limits/forward read ${ns}::getValue ${scobj_hpath} read_switch {MG _LFH}
hsetprop ${scobj_hpath}/limits/forward read_switch ${ns}::read_switch ${scobj_hpath}
@@ -266,7 +261,6 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/limits/forward simulated true
}
# Start of var: reverse
hfactory ${scobj_hpath}/limits/reverse plain user text
hsetprop ${scobj_hpath}/limits/reverse read ${ns}::getValue ${scobj_hpath} read_switch {MG _LRH}
hsetprop ${scobj_hpath}/limits/reverse read_switch ${ns}::read_switch ${scobj_hpath}
@@ -290,12 +284,9 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/limits data "true"
hsetprop ${scobj_hpath}/limits klass "@none"
hsetprop ${scobj_hpath}/limits type "part"
# End of named group: limits
# Start of named group: switches
hfactory ${scobj_hpath}/switches plain spy none
# Start of var: forward
hfactory ${scobj_hpath}/switches/forward plain user text
hsetprop ${scobj_hpath}/switches/forward read ${ns}::getValue ${scobj_hpath} read_switch {MG @IN[5]}
hsetprop ${scobj_hpath}/switches/forward read_switch ${ns}::read_switch ${scobj_hpath}
@@ -317,7 +308,6 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/switches/forward simulated true
}
# Start of var: reverse
hfactory ${scobj_hpath}/switches/reverse plain user text
hsetprop ${scobj_hpath}/switches/reverse read ${ns}::getValue ${scobj_hpath} read_switch {MG @IN[6]}
hsetprop ${scobj_hpath}/switches/reverse read_switch ${ns}::read_switch ${scobj_hpath}
@@ -341,7 +331,6 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
hsetprop ${scobj_hpath}/switches data "true"
hsetprop ${scobj_hpath}/switches klass "@none"
hsetprop ${scobj_hpath}/switches type "part"
# End of named group: switches
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5
@@ -389,8 +378,8 @@ proc add_tank {name ip_address tcp_port} {
::scobj::tank::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
}
clientput "file evaluation of sct_tank.tcl"
::scobj::tank::sics_log 9 "file evaluation of sct_tank.tcl"
clientput "file evaluation of tank_sct.tcl"
::scobj::tank::sics_log 9 "file evaluation of tank_sct.tcl"
proc ::scobj::tank::read_config {} {
set catch_status [ catch {
@@ -462,7 +451,7 @@ proc ::scobj::tank::read_config {} {
}
makesctcontroller sct_${name} aqadapter ${asyncqueue}
}
${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}
}