Merge changes from Dingo 2014-09-09
This commit is contained in:
@ -199,6 +199,41 @@ dz softlowerlim 0
|
|||||||
dz softupperlim 170
|
dz softupperlim 170
|
||||||
dz home 0
|
dz home 0
|
||||||
|
|
||||||
|
# mc1:H Sample rotation axis
|
||||||
|
# Resolver 2,048 counts per degree
|
||||||
|
# Motor 12,500 steps per degree
|
||||||
|
# Positive steps are CCW viewed from above
|
||||||
|
set soma_Home 9867748
|
||||||
|
#set somaStepRate [expr -$motorrate*100.0]
|
||||||
|
set somaStepRate 12500
|
||||||
|
Motor soma $motor_driver_type [params \
|
||||||
|
asyncqueue mc1\
|
||||||
|
host mc1-dingo\
|
||||||
|
port pmc1-dingo\
|
||||||
|
axis H\
|
||||||
|
units degree\
|
||||||
|
hardlowerlim -722\
|
||||||
|
hardupperlim 722\
|
||||||
|
maxSpeed 12\
|
||||||
|
maxAccel 1\
|
||||||
|
maxDecel 1\
|
||||||
|
stepsPerX $somaStepRate\
|
||||||
|
absEnc 1\
|
||||||
|
absEncHome $soma_Home\
|
||||||
|
nopowersave 1\
|
||||||
|
cntsPerX 2048 ]
|
||||||
|
soma speed 0.1
|
||||||
|
soma accel 0.1
|
||||||
|
soma decel 0.1
|
||||||
|
soma part sample
|
||||||
|
soma long_name soma
|
||||||
|
soma softlowerlim -1
|
||||||
|
soma softupperlim 361
|
||||||
|
soma home 0
|
||||||
|
#soma bias_bits 25
|
||||||
|
#soma rotary_bits 25
|
||||||
|
soma creep_offset 0.05
|
||||||
|
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# Motor Controller 2
|
# Motor Controller 2
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
# Author: Jing Chen (jgn@ansto.gov.au)
|
||||||
|
|
||||||
# Required by server_config.tcl
|
# Required by server_config.tcl
|
||||||
VarMake Instrument Text Internal
|
VarMake Instrument Text Internal
|
||||||
Instrument bare_dingo
|
Instrument dingo
|
||||||
Instrument lock
|
Instrument lock
|
||||||
|
|
||||||
#START SERVER CONFIGURATION SECTION
|
#START SERVER CONFIGURATION SECTION
|
||||||
@ -14,12 +14,46 @@ MakeDrive
|
|||||||
|
|
||||||
########################################
|
########################################
|
||||||
# INSTRUMENT SPECIFIC CONFIGURATION
|
# INSTRUMENT SPECIFIC CONFIGURATION
|
||||||
|
|
||||||
|
source $cfPath(hipadaba)/hipadaba_configuration.tcl
|
||||||
|
|
||||||
fileeval $cfPath(source)/source.tcl
|
fileeval $cfPath(source)/source.tcl
|
||||||
fileeval $cfPath(plc)/plc.tcl
|
|
||||||
fileeval $cfPath(motors)/motor_configuration.tcl
|
fileeval $cfPath(motors)/motor_configuration.tcl
|
||||||
|
#fileeval $cfPath(motors)/positmotor_configuration.tcl
|
||||||
|
#fileeval $cfPath(motors)/extraconfig.tcl
|
||||||
|
#fileeval $cfPath(plc)/plc.tcl
|
||||||
|
#fileeval $cfPath(counter)/counter.tcl
|
||||||
|
#fileeval $cfPath(hmm)/hmm_configuration.tcl
|
||||||
|
fileeval $cfPath(nexus)/nxscripts.tcl
|
||||||
fileeval $cfPath(scan)/scan.tcl
|
fileeval $cfPath(scan)/scan.tcl
|
||||||
|
fileeval $cfPath(commands)/commands.tcl
|
||||||
|
#fileeval $cfPath(commands)/pulser.tcl
|
||||||
|
#fileeval $cfPath(commands)/hvcommands.tcl
|
||||||
|
fileeval $cfPath(anticollider)/anticollider.tcl
|
||||||
|
|
||||||
|
source gumxml.tcl
|
||||||
|
|
||||||
|
#::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
|
||||||
|
#::anticollider::protect_detector "true"
|
||||||
|
|
||||||
|
# fix all motors
|
||||||
|
if {1} {
|
||||||
|
set motorlist "[sicslist type motor]"
|
||||||
|
puts $motorlist
|
||||||
|
foreach m $motorlist {
|
||||||
|
if {$m == "motor" || $m == "dummy_motor"} {
|
||||||
|
# skipit
|
||||||
|
} else {
|
||||||
|
$m fixed 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
server_init
|
server_init
|
||||||
exe batchpath ../batch
|
|
||||||
exe syspath ../batch
|
|
||||||
clientput "serverport [get_portnum $::serverport]"
|
clientput "serverport [get_portnum $::serverport]"
|
||||||
|
|
||||||
|
###########################################
|
||||||
|
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
|
||||||
|
|
||||||
|
# You can add extra-configuration code in ../extraconfig.tcl
|
||||||
|
Reference in New Issue
Block a user