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

Remove explicit test debug_threshold from SCT files and regenerate

Browse Source
This commit is contained in:
Douglas Clowes
2014-07-21 10:58:01 +10:00
parent 0becbe914a
commit ab3d7c5adf
9 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct
View File

@ -1,5 +1,4 @@
driver astrium_chopper = { driver astrium_chopper = {
debug_threshold = 2;
vendor = astrium; device = chopper; protocol = std; vendor = astrium; device = chopper; protocol = std;
class = NXdisk_chopper; simulation_group = chopper_simulation; class = NXdisk_chopper; simulation_group = chopper_simulation;
@ -108,6 +107,5 @@ driver astrium_chopper = {
%%} %%}
code mkDriver = {%% code mkDriver = {%%
hsetprop ${scobj_hpath} debug_threshold 1
%%} %%}
} }

5
site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
View File

@ -3,7 +3,7 @@
# #
namespace eval ::scobj::astrium_chopper { namespace eval ::scobj::astrium_chopper {
set debug_threshold 2 set debug_threshold 5
} }
proc ::scobj::astrium_chopper::debug_log {tc_root debug_level debug_string} { proc ::scobj::astrium_chopper::debug_log {tc_root debug_level debug_string} {
@ -526,9 +526,8 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name } {
::scobj::astrium_chopper::sics_log 9 "[chopper_simulation] => No poll/write for astrium_chopper" ::scobj::astrium_chopper::sics_log 9 "[chopper_simulation] => No poll/write for astrium_chopper"
} }
hsetprop ${scobj_hpath} klass NXdisk_chopper hsetprop ${scobj_hpath} klass NXdisk_chopper
hsetprop ${scobj_hpath} debug_threshold 2 hsetprop ${scobj_hpath} debug_threshold 5
# mkDriver hook code starts # mkDriver hook code starts
hsetprop ${scobj_hpath} debug_threshold 1
# mkDriver hook code ends # mkDriver hook code ends
} catch_message ] } catch_message ]
handle_exception ${catch_status} ${catch_message} handle_exception ${catch_status} ${catch_message}

1
site_ansto/instrument/config/environment/huber_pilot.sct
View File

@ -2,7 +2,6 @@
# vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent
# #
driver huber_pilot = { driver huber_pilot = {
debug_threshold = 1;
vendor = Huber; device = 'Pilot ONE'; protocol = std; vendor = Huber; device = 'Pilot ONE'; protocol = std;
class = environment; class = environment;
simulation_group = environment_simulation; simulation_group = environment_simulation;

1
site_ansto/instrument/config/environment/nhq_200.sct
View File

@ -2,7 +2,6 @@
# vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent
# #
driver nhq_200 = { driver nhq_200 = {
debug_threshold = 1;
vendor = FastComTech; device = NHQ; protocol = std; vendor = FastComTech; device = NHQ; protocol = std;
class = environment; class = environment;
simulation_group = environment_simulation; simulation_group = environment_simulation;

1
site_ansto/instrument/config/environment/omron_hldc.sct
View File

@ -2,7 +2,6 @@
# vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent
# #
driver omron_hldc = { driver omron_hldc = {
debug_threshold = 5;
vendor = Omron; device = 'ZS-HDLC'; protocol = std; vendor = Omron; device = 'ZS-HDLC'; protocol = std;
class = environment; class = environment;
simulation_group = environment_simulation; simulation_group = environment_simulation;

4
site_ansto/instrument/config/environment/sct_huber_pilot.tcl
View File

@ -3,7 +3,7 @@
# #
namespace eval ::scobj::huber_pilot { namespace eval ::scobj::huber_pilot {
set debug_threshold 1 set debug_threshold 5
if { ![info exists ::scobj::permlink_device_counter]} { if { ![info exists ::scobj::permlink_device_counter]} {
set ::scobj::permlink_device_counter 0 set ::scobj::permlink_device_counter 0
} }
@ -418,7 +418,7 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name } {
::scobj::huber_pilot::sics_log 9 "[environment_simulation] => No poll/write for huber_pilot" ::scobj::huber_pilot::sics_log 9 "[environment_simulation] => No poll/write for huber_pilot"
} }
hsetprop ${scobj_hpath} klass environment hsetprop ${scobj_hpath} klass environment
hsetprop ${scobj_hpath} debug_threshold 1 hsetprop ${scobj_hpath} debug_threshold 5
if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor_int ${sct_controller} ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor_int ${sct_controller}
} }

4
site_ansto/instrument/config/environment/sct_nhq_200.tcl
View File

@ -3,7 +3,7 @@
# #
namespace eval ::scobj::nhq_200 { namespace eval ::scobj::nhq_200 {
set debug_threshold 1 set debug_threshold 5
} }
proc ::scobj::nhq_200::debug_log {tc_root debug_level debug_string} { proc ::scobj::nhq_200::debug_log {tc_root debug_level debug_string} {
@ -664,7 +664,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name } {
::scobj::nhq_200::sics_log 9 "[environment_simulation] => No poll/write for nhq_200" ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No poll/write for nhq_200"
} }
hsetprop ${scobj_hpath} klass environment hsetprop ${scobj_hpath} klass environment
hsetprop ${scobj_hpath} debug_threshold 1 hsetprop ${scobj_hpath} debug_threshold 5
if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
ansto_makesctdrive ${name}_ch1_v_sp ${scobj_hpath}/ch1/v_sp ${scobj_hpath}/ch1/voltage ${sct_controller} ansto_makesctdrive ${name}_ch1_v_sp ${scobj_hpath}/ch1/v_sp ${scobj_hpath}/ch1/voltage ${sct_controller}
ansto_makesctdrive ${name}_ch2_v_sp ${scobj_hpath}/ch2/v_sp ${scobj_hpath}/ch2/voltage ${sct_controller} ansto_makesctdrive ${name}_ch2_v_sp ${scobj_hpath}/ch2/v_sp ${scobj_hpath}/ch2/voltage ${sct_controller}

1
site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
View File

@ -6,7 +6,6 @@ driver julabo_lh45_gen = {
vendor = julabo; device = lh45; protocol = std; vendor = julabo; device = lh45; protocol = std;
class = environment; class = environment;
simulation_group = environment_simulation simulation_group = environment_simulation
debug_threshold = 1;
add_args = '{id 1} {ctrl_sensor "bath"} {tol 5.0}'; add_args = '{id 1} {ctrl_sensor "bath"} {tol 5.0}';
make_args = 'id ctrl_sensor tol'; make_args = 'id ctrl_sensor tol';
protocol_args = '"\r"'; protocol_args = '"\r"';

4
site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
View File

@ -3,7 +3,7 @@
# #
namespace eval ::scobj::julabo_lh45_gen { namespace eval ::scobj::julabo_lh45_gen {
set debug_threshold 1 set debug_threshold 5
} }
proc ::scobj::julabo_lh45_gen::debug_log {tc_root debug_level debug_string} { proc ::scobj::julabo_lh45_gen::debug_log {tc_root debug_level debug_string} {
@ -594,7 +594,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name id ctrl_sensor tol
::scobj::julabo_lh45_gen::sics_log 9 "[environment_simulation] => No poll/write for julabo_lh45_gen" ::scobj::julabo_lh45_gen::sics_log 9 "[environment_simulation] => No poll/write for julabo_lh45_gen"
} }
hsetprop ${scobj_hpath} klass environment hsetprop ${scobj_hpath} klass environment
hsetprop ${scobj_hpath} debug_threshold 1 hsetprop ${scobj_hpath} debug_threshold 5
if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor/value ${sct_controller} ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor/value ${sct_controller}
} }