linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from Wombat, except sics_config.ini

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl
This commit is contained in:
Douglas Clowes
2014-06-24 17:20:27 +10:00
parent 3f8f5fcba7
commit 648c8003b7
6 changed files with 179 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
site_ansto/instrument/hipd/config/motors/euler_configuration.tcl
View File

@@ -1,8 +1,9 @@
# This must be loaded by motor_configuration.tcl
set ephi_Home 26575217
set echi_Home 24224381
#set echi_Home 24224381
#set echi_Home 8919294
set echi_Home 24207159
set eom_Home 23165482
# Sample Tilt 1, euler omega stage
@@ -32,7 +33,7 @@ Motor echi $motor_driver_type [params \
axis B\
units degrees\
hardlowerlim -45\
hardupperlim 100\
hardupperlim 120\
maxSpeed 2\
maxAccel 2\
maxDecel 2\
@@ -42,7 +43,7 @@ Motor echi $motor_driver_type [params \
cntsPerX 8192]
setHomeandRange -motor echi -home 0 -lowrange 10 -uprange 95
echi softlowerlim -10
echi softupperlim 99
echi softupperlim 120
echi home 0
echi speed 1
echi movecount $move_count
@@ -53,7 +54,7 @@ echi long_name euler_chi
# Sample Trans 1, upper, y
Motor ephi $motor_driver_type [params \
asyncqueue mc2\
axis D\
axis C\
units degrees\
hardlowerlim -185\
hardupperlim 185\