From 1678c5a73eb1fa20c0bb226dffcb2a6aa8a3572c Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 31 Jan 2014 09:18:15 +1100 Subject: [PATCH] New version of the Bilby_motion_control_commissioning_checklist.xls spreadsheet. Generated new motor configuration. --- ...motion_control_commissioning_checklist.csv | 110 +++++++++--------- .../motors/generated_motor_configuration.tcl | 42 +++---- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv b/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv index d17f687d..dd992307 100755 --- a/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv +++ b/site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv @@ -4,73 +4,73 @@ ap1_axis,A ap1_D10,86208 ap1_D20,91680 ap1_D40,97116 -ap1_fwd_enc_lim,112034 -ap1_mc,mc2 -ap1_rev_enc_lim,74080 +ap1_fwd_enc_lim,112188 +ap1_mc,mc1 +ap1_rev_enc_lim,73952 ap2_100X100,93637 ap2_40X40,85637 ap2_axis,B ap2_D10,69193 ap2_D20,74677 ap2_D40,80149 -ap2_fwd_enc_lim,94547 -ap2_mc,mc2 -ap2_rev_enc_lim,55223 +ap2_fwd_enc_lim,95461 +ap2_mc,mc1 +ap2_rev_enc_lim,54293 ap3_100X100,49584 ap3_40X40,41532 ap3_axis,C ap3_D10,25168 ap3_D20,30656 ap3_D40,36080 -ap3_fwd_enc_lim,51202 -ap3_mc,mc2 -ap3_rev_enc_lim,13986 +ap3_fwd_enc_lim,51616 +ap3_mc,mc1 +ap3_rev_enc_lim,13644 ap4_100X100,43506 ap4_40X40,35490 ap4_axis,D ap4_D10,19118 ap4_D20,24578 ap4_D40,30038 -ap4_fwd_enc_lim,44896 -ap4_mc,mc2 -ap4_rev_enc_lim,5616 +ap4_fwd_enc_lim,45234 +ap4_mc,mc1 +ap4_rev_enc_lim,5666 ap5_100X100,109480 ap5_40X40,101476 ap5_axis,E ap5_D10,85076 ap5_D20,90552 ap5_D40,96008 -ap5_fwd_enc_lim,110330 -ap5_mc,mc2 -ap5_rev_enc_lim,73254 +ap5_fwd_enc_lim,110696 +ap5_mc,mc1 +ap5_rev_enc_lim,72824 ap6_100X100,110499 ap6_40X40,102419 ap6_axis,F ap6_D10,86097 ap6_D20,91587 ap6_D40,97011 -ap6_fwd_enc_lim,112081 -ap6_mc,mc2 -ap6_rev_enc_lim,72533 +ap6_fwd_enc_lim,112435 +ap6_mc,mc1 +ap6_rev_enc_lim,72115 ap7_100X100,110371 ap7_40X40,102343 ap7_axis,G ap7_D10,85929 ap7_D20,91399 ap7_D40,96871 -ap7_fwd_enc_lim,112135 -ap7_mc,mc2 -ap7_rev_enc_lim,74427 +ap7_fwd_enc_lim,112391 +ap7_mc,mc1 +ap7_rev_enc_lim,74299 ap8_100X100,46069 ap8_40X40,38027 ap8_axis,H ap8_D10,21657 ap8_D20,27115 ap8_D40,32629 -ap8_fwd_enc_lim,47285 -ap8_mc,mc2 -ap8_rev_enc_lim,7189 -att_axis,att +ap8_fwd_enc_lim,6791 +ap8_mc,mc1 +ap8_rev_enc_lim,47639 +att_axis,A att_fwd_enc_lim,33394989 att_mc,mc4 att_pos1,33373433 @@ -81,60 +81,60 @@ att_pos5,33045750 att_rev_enc_lim,33021197 col1_aperture,541261 col1_axis,A -col1_fwd_enc_lim,556961 +col1_fwd_enc_lim,557470 col1_guide,262369 -col1_mc,mc1 -col1_rev_enc_lim,4666 +col1_mc,mc2 +col1_rev_enc_lim,3902 col2_aperture,546816 col2_axis,B -col2_fwd_enc_lim,561758 +col2_fwd_enc_lim,564598 col2_guide,273591 -col2_mc,mc1 -col2_rev_enc_lim,10598 +col2_mc,mc2 +col2_rev_enc_lim,9598 col3_aperture,558462 col3_axis,C -col3_fwd_enc_lim,579452 +col3_fwd_enc_lim,578556 col3_guide,287471 -col3_mc,mc1 -col3_rev_enc_lim,28865 +col3_mc,mc2 +col3_rev_enc_lim,29466 col4_aperture,1062105 col4_axis,D -col4_fwd_enc_lim,1119318 +col4_fwd_enc_lim,1116447 col4_guide,539261 -col4_mc,mc1 -col4_rev_enc_lim,11788 +col4_mc,mc2 +col4_rev_enc_lim,12861 col5_aperture,904072 col5_axis,E -col5_fwd_enc_lim,929232 +col5_fwd_enc_lim,928235 col5_guide,644380 -col5_mc,mc1 -col5_rev_enc_lim,376887 +col5_mc,mc2 +col5_rev_enc_lim,377801 col6_aperture,721132 col6_axis,F -col6_fwd_enc_lim,748803 +col6_fwd_enc_lim,747130 col6_guide,457285 -col6_mc,mc1 -col6_rev_enc_lim,190872 +col6_mc,mc2 +col6_rev_enc_lim,191508 col7_aperture,555984 col7_axis,G -col7_fwd_enc_lim,578594 +col7_fwd_enc_lim,577633 col7_guide,288216 -col7_mc,mc1 -col7_rev_enc_lim,23912 +col7_mc,mc2 +col7_rev_enc_lim,24810 col8_aperture,538544 col8_axis,H -col8_fwd_enc_lim,563017 +col8_fwd_enc_lim,561091 col8_guide,273474 -col8_mc,mc1 -col8_rev_enc_lim,12085 +col8_mc,mc2 +col8_rev_enc_lim,12893 sdh_5a_in,1535698 sdh_5b_in,3747542 -sdh_axis,D -sdh_fwd_enc_lim,1114132 +sdh_axis,B +sdh_fwd_enc_lim,1189505 sdh_mc,mc4 -sdh_rev_enc_lim,4208665 -vs_axis,B -vs_fwd_enc_lim,1303768 +sdh_rev_enc_lim,4166803 +vs_axis,D +vs_fwd_enc_lim,406690 vs_glass_in,741128 vs_mc,mc4 -vs_rev_enc_lim,4663634 +vs_rev_enc_lim,3789130 diff --git a/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl b/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl index 01a08900..53f0788c 100644 --- a/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl +++ b/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl @@ -1,18 +1,18 @@ #### SICS motor driver configuration #### -# 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 by: ../../../util/genmotconf.tcl Bilby_Motion_control_axes.csv Bilby_motion_control_commissioning_checklist.csv hdb_info.csv sicsmot_attlist.csv +# Date: 2014-01-31T09:01:29 # Generated from the following files, # file1: Bilby_Motion_control_axes.csv # file2: Bilby_motion_control_commissioning_checklist.csv -# file3: sicsmot_attlist.csv -# file4: hdb_info.csv +# file3: hdb_info.csv +# file4: sicsmot_attlist.csv # Load motor driver configuration parameters set flist [list\ {Bilby_Motion_control_axes.csv}\ {Bilby_motion_control_commissioning_checklist.csv}\ - {sicsmot_attlist.csv}\ {hdb_info.csv}\ + {sicsmot_attlist.csv}\ ] foreach fattfile $flist { @@ -45,7 +45,7 @@ if {$sim_mode == false} { # ap1 configuration Motor ap1 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis A\ units $ap1_units\ hardlowerlim $ap1_rev_lim\ @@ -71,7 +71,7 @@ ap1 long_name ap1 # ap2 configuration Motor ap2 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis B\ units $ap2_units\ hardlowerlim $ap2_rev_lim\ @@ -97,7 +97,7 @@ ap2 long_name ap2 # ap3 configuration Motor ap3 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis C\ units $ap3_units\ hardlowerlim $ap3_rev_lim\ @@ -123,7 +123,7 @@ ap3 long_name ap3 # ap4 configuration Motor ap4 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis D\ units $ap4_units\ hardlowerlim $ap4_rev_lim\ @@ -149,7 +149,7 @@ ap4 long_name ap4 # ap5 configuration Motor ap5 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis E\ units $ap5_units\ hardlowerlim $ap5_rev_lim\ @@ -175,7 +175,7 @@ ap5 long_name ap5 # ap6 configuration Motor ap6 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis F\ units $ap6_units\ hardlowerlim $ap6_rev_lim\ @@ -201,7 +201,7 @@ ap6 long_name ap6 # ap7 configuration Motor ap7 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis G\ units $ap7_units\ hardlowerlim $ap7_rev_lim\ @@ -227,7 +227,7 @@ ap7 long_name ap7 # ap8 configuration Motor ap8 $motor_driver_type [params\ - asyncqueue mc2\ + asyncqueue mc1\ axis H\ units $ap8_units\ hardlowerlim $ap8_rev_lim\ @@ -253,7 +253,7 @@ ap8 long_name ap8 # col1 configuration Motor col1 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis A\ units $col1_units\ hardlowerlim $col1_rev_lim\ @@ -276,7 +276,7 @@ col1 long_name col1 # col2 configuration Motor col2 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis B\ units $col2_units\ hardlowerlim $col2_rev_lim\ @@ -299,7 +299,7 @@ col2 long_name col2 # col3 configuration Motor col3 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis C\ units $col3_units\ hardlowerlim $col3_rev_lim\ @@ -322,7 +322,7 @@ col3 long_name col3 # col4 configuration Motor col4 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis D\ units $col4_units\ hardlowerlim $col4_rev_lim\ @@ -345,7 +345,7 @@ col4 long_name col4 # col5 configuration Motor col5 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis E\ units $col5_units\ hardlowerlim $col5_rev_lim\ @@ -368,7 +368,7 @@ col5 long_name col5 # col6 configuration Motor col6 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis F\ units $col6_units\ hardlowerlim $col6_rev_lim\ @@ -391,7 +391,7 @@ col6 long_name col6 # col7 configuration Motor col7 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis G\ units $col7_units\ hardlowerlim $col7_rev_lim\ @@ -414,7 +414,7 @@ col7 long_name col7 # col8 configuration Motor col8 $motor_driver_type [params\ - asyncqueue mc1\ + asyncqueue mc2\ axis H\ units $col8_units\ hardlowerlim $col8_rev_lim\