Pelican merge: pelican_configuration.tcl, motor_configuration.tcl

This commit is contained in:
Douglas Clowes
2014-06-26 15:15:58 +10:00
parent 8bf1764dd9
commit 8bed9404e4
2 changed files with 10 additions and 10 deletions

View File

@ -20,8 +20,8 @@ set dummy_Home 0
set ptz_Home 32096132
set ftz_Home 1242083
set pom_Home 34677
set stth_Home 152965
set pom_Home 38107
set stth_Home 33181043
set mtth_Home 24409175
set sv1_Home 33431185
@ -116,16 +116,15 @@ Motor ptz $motor_driver_type [params \
absEnc 1\
absEncHome $ptz_Home\
cntsPerX -[expr { 8192.0 / 2.0 }]\
posit_count 3]
posit_count 2]
ptz part crystal
ptz long_name ptz
ptz softlowerlim -264
ptz softupperlim 187
ptz home 0
# 1:RevLimit, 2:Coll, 3:Open, 4:Polarizer, 5:FwdLim
ptz posit_1 31408274
ptz posit_2 32096132
ptz posit_3 33171650
ptz posit_1 31469731
ptz posit_2 32163716
ptz creep_offset 0.001
# mc1: Beryllium / Graphite filter shared - Z translation slide
@ -213,7 +212,7 @@ stth part detector
stth long_name stth
stth softlowerlim -60
stth softupperlim 65
stth home 0
stth home 8.481445
stth Blockage_Thresh 5.0
stth Blockage_Ratio 50.0
stth Backlash_offset 0
@ -231,7 +230,7 @@ Motor mtth $motor_driver_type [params \
port pmc1-pelican\
axis G\
units degrees\
hardlowerlim 43\
hardlowerlim 47\
hardupperlim 134\
maxSpeed [expr { 100000.0 / $mtthStepRate }]\
maxAccel [expr { 25000.0 / $mtthStepRate }]\
@ -242,7 +241,7 @@ Motor mtth $motor_driver_type [params \
cntsPerX -[expr { (1<<25)/360.0 }]]
mtth part crystal
mtth long_name mtth
mtth softlowerlim 43
mtth softlowerlim 47
mtth softupperlim 134
mtth home 90
mtth MotOffDelay 2000

View File

@ -27,8 +27,9 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl
#fileeval $cfPath(motors)/extraconfig.tcl
fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(beamline)/sct_power.tcl
#fileeval $cfPath(beamline)/sct_power.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(hmm)/sct_hv.tcl