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 637c00dc..469e4f8a 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 @@ -169,6 +169,20 @@ att_pos4,33127674 att_pos5,33045750 att_rev_enc_lim,33021197 att_steps_per_x,-4166.66666666667 +bs3_axis,C +bs3_axis_number,43 +bs3_cnts_per_x,728.177777777778 +bs3_description,beam stop 3 +bs3_dflt_accel_steps,12500 +bs3_dflt_decel_steps,12500 +bs3_dflt_speed_steps,12500 +bs3_fwd_enc_lim,300855 +bs3_maxaccel,5.625 +bs3_maxdecel,5.625 +bs3_maxspeed,5.625 +bs3_mc,mc6 +bs3_rev_enc_lim,351548 +bs3_steps_per_x,2222.22222222222 cdd_axis,F cdd_axis_number,62 cdd_cnts_per_x,32768 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 f45931e4..cd11631e 100644 --- a/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl +++ b/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl @@ -41,6 +41,7 @@ if {$sim_mode == false} { 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] MakeAsyncQueue mc4 DMC2280 [dict get $::MOTOR_HOSTPORT MC4 HOST] [dict get $::MOTOR_HOSTPORT MC4 PORT] + MakeAsyncQueue mc6 DMC2280 [dict get $::MOTOR_HOSTPORT MC6 HOST] [dict get $::MOTOR_HOSTPORT MC6 PORT] MakeAsyncQueue mc8 DMC2280 [dict get $::MOTOR_HOSTPORT MC8 HOST] [dict get $::MOTOR_HOSTPORT MC8 PORT] } @@ -323,6 +324,32 @@ att speed $att_speed att accel $att_accel att decel $att_decel +# bs3 configuration +# beam stop 3 +# Axis number 43 +Motor bs3 $motor_driver_type [params\ + asyncqueue mc6\ + axis C\ + units $bs3_units\ + hardlowerlim $bs3_rev_lim\ + hardupperlim $bs3_fwd_lim\ + maxSpeed $bs3_maxspeed\ + maxAccel $bs3_maxaccel\ + maxDecel $bs3_maxdecel\ + stepsPerX $bs3_steps_per_x\ + posit_count 0\ + absEnc 1\ + absEncHome $bs3_absenchome\ + cntsPerX $bs3_cnts_per_x] +bs3 softlowerlim $bs3_rev_lim +bs3 softupperlim $bs3_fwd_lim +bs3 home $bs3_home +bs3 part $bs3_part +bs3 long_name bs3 +bs3 speed $bs3_speed +bs3 accel $bs3_accel +bs3 decel $bs3_decel + # cdd configuration # CURTAIN DETECTOR BOTTOM TRANSLATION # Axis number 62 diff --git a/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv b/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv index 224d8d81..c00fed42 100644 --- a/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv +++ b/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv @@ -61,6 +61,13 @@ att_fwd_lim,273.7734 att_home,0.0000 att_rev_lim,0.0000 att_speed,3.6000 +bs3_absenchome,351548.0000 +bs3_accel,5.6250 +bs3_decel,5.6250 +bs3_fwd_lim,-69.6162 +bs3_home,0.0000 +bs3_rev_lim,0.0000 +bs3_speed,5.6250 cdd_absenchome,4159255.0000 cdd_accel,0.2500 cdd_decel,0.2500