genmotconf.tcl now sorts the posit_n parameters by value.
Sort is ascending if cntsperx is positive, descending if negative. Improve error and report logs generated by genmotconf.tcl It is not an error if a missing attributed can be initialised with a default value by genmotconf.tcl. Replace the COLLIMATOR_POSITIONS.csv with Bilby_motion_control_commissioning_checklist.csv Generate new "generated_motor_configuration.tcl" file.
This commit is contained in:
committed by
Ferdi Franceschini
parent
f6ae3c62f7
commit
4a134cf2d0
@@ -70,6 +70,15 @@ ap8_D40,32629
|
||||
ap8_fwd_enc_lim,47285
|
||||
ap8_mc,mc2
|
||||
ap8_rev_enc_lim,7189
|
||||
att_axis,att
|
||||
att_fwd_enc_lim,33394989
|
||||
att_mc,mc4
|
||||
att_pos1,33373433
|
||||
att_pos2,33291514
|
||||
att_pos3,33209595
|
||||
att_pos4,33127674
|
||||
att_pos5,33045750
|
||||
att_rev_enc_lim,33021197
|
||||
col1_aperture,541261
|
||||
col1_axis,A
|
||||
col1_fwd_enc_lim,556961
|
||||
@@ -118,6 +127,14 @@ col8_fwd_enc_lim,563017
|
||||
col8_guide,273474
|
||||
col8_mc,mc1
|
||||
col8_rev_enc_lim,12085
|
||||
vs_100X40,741128
|
||||
vs_axis,A
|
||||
vs_mc,mc3
|
||||
sdh_5a_in,1535698
|
||||
sdh_5b_in,3747542
|
||||
sdh_axis,D
|
||||
sdh_fwd_enc_lim,1114132
|
||||
sdh_mc,mc4
|
||||
sdh_rev_enc_lim,4208665
|
||||
vs_axis,B
|
||||
vs_fwd_enc_lim,1303768
|
||||
vs_glass_in,741128
|
||||
vs_mc,mc4
|
||||
vs_rev_enc_lim,4663634
|
||||
|
@@ -1,16 +1,16 @@
|
||||
#### SICS motor driver configuration ####
|
||||
# Generated by: ../../../util/genmotconf.tcl Bilby_Motion_control_axes.csv COLLIMATOR_POSITIONS_D.csv sicsmot_attlist.csv hdb_info.csv
|
||||
# Date: 2014-01-15T15:36:43
|
||||
# Generated by: ../../../util/genmotconf.tcl Bilby_Motion_control_axes.csv Bilby_motion_control_commissioning_checklist.csv sicsmot_attlist.csv hdb_info.csv
|
||||
# Date: 2014-01-24T15:37:28
|
||||
# Generated from the following files,
|
||||
# file1: Bilby_Motion_control_axes.csv
|
||||
# file2: COLLIMATOR_POSITIONS_D.csv
|
||||
# file2: Bilby_motion_control_commissioning_checklist.csv
|
||||
# file3: sicsmot_attlist.csv
|
||||
# file4: hdb_info.csv
|
||||
|
||||
# Load motor driver configuration parameters
|
||||
set flist [list\
|
||||
{Bilby_Motion_control_axes.csv}\
|
||||
{COLLIMATOR_POSITIONS_D.csv}\
|
||||
{Bilby_motion_control_commissioning_checklist.csv}\
|
||||
{sicsmot_attlist.csv}\
|
||||
{hdb_info.csv}\
|
||||
]
|
||||
@@ -38,9 +38,9 @@ if {$sim_mode == true} {
|
||||
}
|
||||
|
||||
if {$sim_mode == false} {
|
||||
MakeAsyncQueue mc4 DMC2280 [dict get $::MOTOR_HOSTPORT MC4 HOST] [dict get $::MOTOR_HOSTPORT MC4 PORT]
|
||||
MakeAsyncQueue mc1 DMC2280 [dict get $::MOTOR_HOSTPORT MC1 HOST] [dict get $::MOTOR_HOSTPORT MC1 PORT]
|
||||
MakeAsyncQueue mc2 DMC2280 [dict get $::MOTOR_HOSTPORT MC2 HOST] [dict get $::MOTOR_HOSTPORT MC2 PORT]
|
||||
MakeAsyncQueue mc3 DMC2280 [dict get $::MOTOR_HOSTPORT MC3 HOST] [dict get $::MOTOR_HOSTPORT MC3 PORT]
|
||||
}
|
||||
|
||||
# ap1 configuration
|
||||
@@ -55,11 +55,11 @@ Motor ap1 $motor_driver_type [params\
|
||||
maxDecel $ap1_maxdecel\
|
||||
stepsPerX $ap1_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap1_100X100\
|
||||
posit_2 $ap1_40X40\
|
||||
posit_3 $ap1_D10\
|
||||
posit_4 $ap1_D20\
|
||||
posit_5 $ap1_D40\
|
||||
posit_1 $ap1_D10\
|
||||
posit_2 $ap1_D20\
|
||||
posit_3 $ap1_D40\
|
||||
posit_4 $ap1_40X40\
|
||||
posit_5 $ap1_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap1_absenchome\
|
||||
cntsPerX $ap1_cnts_per_x]
|
||||
@@ -81,11 +81,11 @@ Motor ap2 $motor_driver_type [params\
|
||||
maxDecel $ap2_maxdecel\
|
||||
stepsPerX $ap2_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap2_100X100\
|
||||
posit_2 $ap2_40X40\
|
||||
posit_3 $ap2_D10\
|
||||
posit_4 $ap2_D20\
|
||||
posit_5 $ap2_D40\
|
||||
posit_1 $ap2_D10\
|
||||
posit_2 $ap2_D20\
|
||||
posit_3 $ap2_D40\
|
||||
posit_4 $ap2_40X40\
|
||||
posit_5 $ap2_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap2_absenchome\
|
||||
cntsPerX $ap2_cnts_per_x]
|
||||
@@ -107,11 +107,11 @@ Motor ap3 $motor_driver_type [params\
|
||||
maxDecel $ap3_maxdecel\
|
||||
stepsPerX $ap3_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap3_100X100\
|
||||
posit_2 $ap3_40X40\
|
||||
posit_3 $ap3_D10\
|
||||
posit_4 $ap3_D20\
|
||||
posit_5 $ap3_D40\
|
||||
posit_1 $ap3_D10\
|
||||
posit_2 $ap3_D20\
|
||||
posit_3 $ap3_D40\
|
||||
posit_4 $ap3_40X40\
|
||||
posit_5 $ap3_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap3_absenchome\
|
||||
cntsPerX $ap3_cnts_per_x]
|
||||
@@ -133,11 +133,11 @@ Motor ap4 $motor_driver_type [params\
|
||||
maxDecel $ap4_maxdecel\
|
||||
stepsPerX $ap4_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap4_100X100\
|
||||
posit_2 $ap4_40X40\
|
||||
posit_3 $ap4_D10\
|
||||
posit_4 $ap4_D20\
|
||||
posit_5 $ap4_D40\
|
||||
posit_1 $ap4_D10\
|
||||
posit_2 $ap4_D20\
|
||||
posit_3 $ap4_D40\
|
||||
posit_4 $ap4_40X40\
|
||||
posit_5 $ap4_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap4_absenchome\
|
||||
cntsPerX $ap4_cnts_per_x]
|
||||
@@ -159,11 +159,11 @@ Motor ap5 $motor_driver_type [params\
|
||||
maxDecel $ap5_maxdecel\
|
||||
stepsPerX $ap5_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap5_100X100\
|
||||
posit_2 $ap5_40X40\
|
||||
posit_3 $ap5_D10\
|
||||
posit_4 $ap5_D20\
|
||||
posit_5 $ap5_D40\
|
||||
posit_1 $ap5_D10\
|
||||
posit_2 $ap5_D20\
|
||||
posit_3 $ap5_D40\
|
||||
posit_4 $ap5_40X40\
|
||||
posit_5 $ap5_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap5_absenchome\
|
||||
cntsPerX $ap5_cnts_per_x]
|
||||
@@ -185,11 +185,11 @@ Motor ap6 $motor_driver_type [params\
|
||||
maxDecel $ap6_maxdecel\
|
||||
stepsPerX $ap6_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap6_100X100\
|
||||
posit_2 $ap6_40X40\
|
||||
posit_3 $ap6_D10\
|
||||
posit_4 $ap6_D20\
|
||||
posit_5 $ap6_D40\
|
||||
posit_1 $ap6_D10\
|
||||
posit_2 $ap6_D20\
|
||||
posit_3 $ap6_D40\
|
||||
posit_4 $ap6_40X40\
|
||||
posit_5 $ap6_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap6_absenchome\
|
||||
cntsPerX $ap6_cnts_per_x]
|
||||
@@ -211,11 +211,11 @@ Motor ap7 $motor_driver_type [params\
|
||||
maxDecel $ap7_maxdecel\
|
||||
stepsPerX $ap7_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap7_100X100\
|
||||
posit_2 $ap7_40X40\
|
||||
posit_3 $ap7_D10\
|
||||
posit_4 $ap7_D20\
|
||||
posit_5 $ap7_D40\
|
||||
posit_1 $ap7_D10\
|
||||
posit_2 $ap7_D20\
|
||||
posit_3 $ap7_D40\
|
||||
posit_4 $ap7_40X40\
|
||||
posit_5 $ap7_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap7_absenchome\
|
||||
cntsPerX $ap7_cnts_per_x]
|
||||
@@ -237,11 +237,11 @@ Motor ap8 $motor_driver_type [params\
|
||||
maxDecel $ap8_maxdecel\
|
||||
stepsPerX $ap8_steps_per_x\
|
||||
posit_count 5\
|
||||
posit_1 $ap8_100X100\
|
||||
posit_2 $ap8_40X40\
|
||||
posit_3 $ap8_D10\
|
||||
posit_4 $ap8_D20\
|
||||
posit_5 $ap8_D40\
|
||||
posit_1 $ap8_D10\
|
||||
posit_2 $ap8_D20\
|
||||
posit_3 $ap8_D40\
|
||||
posit_4 $ap8_40X40\
|
||||
posit_5 $ap8_100X100\
|
||||
absEnc 1\
|
||||
absEncHome $ap8_absenchome\
|
||||
cntsPerX $ap8_cnts_per_x]
|
||||
@@ -263,8 +263,8 @@ Motor col1 $motor_driver_type [params\
|
||||
maxDecel $col1_maxdecel\
|
||||
stepsPerX $col1_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col1_aperture\
|
||||
posit_2 $col1_guide\
|
||||
posit_1 $col1_guide\
|
||||
posit_2 $col1_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col1_absenchome\
|
||||
cntsPerX $col1_cnts_per_x]
|
||||
@@ -286,8 +286,8 @@ Motor col2 $motor_driver_type [params\
|
||||
maxDecel $col2_maxdecel\
|
||||
stepsPerX $col2_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col2_aperture\
|
||||
posit_2 $col2_guide\
|
||||
posit_1 $col2_guide\
|
||||
posit_2 $col2_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col2_absenchome\
|
||||
cntsPerX $col2_cnts_per_x]
|
||||
@@ -309,8 +309,8 @@ Motor col3 $motor_driver_type [params\
|
||||
maxDecel $col3_maxdecel\
|
||||
stepsPerX $col3_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col3_aperture\
|
||||
posit_2 $col3_guide\
|
||||
posit_1 $col3_guide\
|
||||
posit_2 $col3_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col3_absenchome\
|
||||
cntsPerX $col3_cnts_per_x]
|
||||
@@ -332,8 +332,8 @@ Motor col4 $motor_driver_type [params\
|
||||
maxDecel $col4_maxdecel\
|
||||
stepsPerX $col4_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col4_aperture\
|
||||
posit_2 $col4_guide\
|
||||
posit_1 $col4_guide\
|
||||
posit_2 $col4_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col4_absenchome\
|
||||
cntsPerX $col4_cnts_per_x]
|
||||
@@ -355,8 +355,8 @@ Motor col5 $motor_driver_type [params\
|
||||
maxDecel $col5_maxdecel\
|
||||
stepsPerX $col5_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col5_aperture\
|
||||
posit_2 $col5_guide\
|
||||
posit_1 $col5_guide\
|
||||
posit_2 $col5_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col5_absenchome\
|
||||
cntsPerX $col5_cnts_per_x]
|
||||
@@ -378,8 +378,8 @@ Motor col6 $motor_driver_type [params\
|
||||
maxDecel $col6_maxdecel\
|
||||
stepsPerX $col6_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col6_aperture\
|
||||
posit_2 $col6_guide\
|
||||
posit_1 $col6_guide\
|
||||
posit_2 $col6_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col6_absenchome\
|
||||
cntsPerX $col6_cnts_per_x]
|
||||
@@ -401,8 +401,8 @@ Motor col7 $motor_driver_type [params\
|
||||
maxDecel $col7_maxdecel\
|
||||
stepsPerX $col7_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col7_aperture\
|
||||
posit_2 $col7_guide\
|
||||
posit_1 $col7_guide\
|
||||
posit_2 $col7_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col7_absenchome\
|
||||
cntsPerX $col7_cnts_per_x]
|
||||
@@ -424,8 +424,8 @@ Motor col8 $motor_driver_type [params\
|
||||
maxDecel $col8_maxdecel\
|
||||
stepsPerX $col8_steps_per_x\
|
||||
posit_count 2\
|
||||
posit_1 $col8_aperture\
|
||||
posit_2 $col8_guide\
|
||||
posit_1 $col8_guide\
|
||||
posit_2 $col8_aperture\
|
||||
absEnc 1\
|
||||
absEncHome $col8_absenchome\
|
||||
cntsPerX $col8_cnts_per_x]
|
||||
|
||||
Reference in New Issue
Block a user