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 502c81a0..17b71c4f 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 @@ -568,6 +568,24 @@ samz_part,sample samz_rev_enc_lim,755970 samz_steps_per_x,200000 samz_units,mm +sapmot_absenchome,1857912 +sapmot_axis,F +sapmot_axis_number,38 +sapmot_cnts_per_x,4096 +sapmot_description,SAMPLE APERTURE +sapmot_dflt_accel_steps,50000 +sapmot_dflt_decel_steps,50000 +sapmot_dflt_speed_steps,100000 +sapmot_fwd_enc_lim,1917305 +sapmot_home,333 +sapmot_maxaccel,8 +sapmot_maxdecel,8 +sapmot_maxspeed,8 +sapmot_mc,mc5 +sapmot_part,sample +sapmot_rev_enc_lim,283423 +sapmot_steps_per_x,12500 +sapmot_units,mm som_absenchome,33286381 som_axis,C som_axis_number,35 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 1f247559..e60315c5 100644 --- a/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl +++ b/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl @@ -887,6 +887,32 @@ samz speed $samz_speed samz accel $samz_accel samz decel $samz_decel +# sapmot configuration +# SAMPLE APERTURE +# Axis number 38 +Motor sapmot $motor_driver_type [params\ + asyncqueue mc5\ + axis F\ + units $sapmot_units\ + hardlowerlim $sapmot_rev_lim\ + hardupperlim $sapmot_fwd_lim\ + maxSpeed $sapmot_maxspeed\ + maxAccel $sapmot_maxaccel\ + maxDecel $sapmot_maxdecel\ + stepsPerX $sapmot_steps_per_x\ + posit_count 0\ + absEnc 1\ + absEncHome $sapmot_absenchome\ + cntsPerX $sapmot_cnts_per_x] +sapmot softlowerlim $sapmot_rev_lim +sapmot softupperlim $sapmot_fwd_lim +sapmot home $sapmot_home +sapmot part $sapmot_part +sapmot long_name sapmot +sapmot speed $sapmot_speed +sapmot accel $sapmot_accel +sapmot decel $sapmot_decel + # som configuration # SAMPLE ROTATION # Axis number 35 diff --git a/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv b/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv index 6fec6f91..ee02766f 100644 --- a/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv +++ b/site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv @@ -186,6 +186,11 @@ samz_fwd_lim,-501.0043 samz_home,0.0000 samz_rev_lim,0.0000 samz_speed,1.0000 +sapmot_accel,4.0000 +sapmot_decel,4.0000 +sapmot_fwd_lim,347.5002 +sapmot_rev_lim,-51.3967 +sapmot_speed,8.0000 som_accel,1.2857 som_decel,1.2857 som_fwd_lim,340.6038