SICS-795 Bring GIT up to date with changes made on ics1-wombat.

This commit is contained in:
Ferdi Franceschini
2014-10-08 20:29:23 +11:00
parent 9720f1d0f0
commit d8f5030a8d
8 changed files with 122 additions and 48 deletions

View File

@@ -56,20 +56,20 @@ Motor ephi $motor_driver_type [params \
asyncqueue mc2\
axis C\
units degrees\
hardlowerlim -185\
hardupperlim 185\
hardlowerlim -365\
hardupperlim 365\
maxSpeed 5\
maxAccel 5\
maxDecel 1\
maxDecel 5\
stepsPerX -12500\
absEnc 1\
absEncHome $ephi_Home\
cntsPerX -4096]
setHomeandRange -motor ephi -home 0 -lowrange 180 -uprange 180
ephi softlowerlim -180
ephi softupperlim 180
setHomeandRange -motor ephi -home 0 -lowrange -360 -uprange 360
ephi softlowerlim -360
ephi softupperlim 360
ephi home 0
ephi speed 1
ephi speed 3
ephi movecount $move_count
ephi precision 0.01
ephi part sample

View File

@@ -24,8 +24,9 @@ if {$sim_mode == "true"} {
#set mx_Home 23263535
set mx_Home 8390583
#set mom_Home 9274794
#set mom_Home 8391038
set mom_Home 8147038
##set mom_Home 8391038
#set mom_Home 8147038
set mom_Home 7736816
set mtth_Home 19927837
#set mphi_Home 7613516
#set mphi_Home 27847793
@@ -291,7 +292,7 @@ Motor mom $motor_driver_type [params \
absEnc 1\
absEncHome $mom_Home\
cntsPerX -2048]
setHomeandRange -motor mom -home 0 -lowrange 5 -uprange 165
setHomeandRange -motor mom -home 59.5066 -lowrange 5 -uprange 165
#setHomeandRange -motor mom -home 60.08 -lowrange 5 -uprange 165
mom speed 1
mom movecount $move_count

View File

@@ -1,7 +1,8 @@
# This must be loaded by motor_configuration.tcl
set sphi_Home 7938520
set schi_Home 7586052
#set schi_Home 7586052
set schi_Home 9932404
set sy_Home 7790194
set sx_Home 7556649