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

Merge branch 'RELEASE-3_1'

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
This commit is contained in:
Douglas Clowes
2014-11-06 14:13:20 +11:00
parent 2076c0a5fc 8a61f65701
commit 3ce5ae0977
52 changed files with 4133 additions and 3116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/config/environment/sct_mvp.tcl
View File

@@ -455,7 +455,7 @@ debug_log "Registering node $nodeName for write callback"
hsetprop $scobj_hpath device "$dev"
set deviceCommand {\
Display Position 1 0 1 1 0 text internal {LQP} {rdValue} {} {} {}\
Display Position 1 0 1 1 0 int internal {LQP} {rdValue} {} {} {}\
Display Angle 1 0 1 1 0 text internal {LQA} {rdValue} {} {} {}\
Display Hertz 1 0 1 1 0 text internal {LQF} {rdValue} {} {} {}\
Display Finished 1 0 1 1 0 text internal {F} {rdValue} {} {} {}\
@@ -465,7 +465,7 @@ debug_log "Registering node $nodeName for write callback"
Display Device 1 0 1 1 0 text internal {E3} {rdValue} {} {} {}\
Display Encoder 1 0 1 1 0 text internal {E4} {rdValue} {} {} {}\
Control Direction 0 1 1 1 0 text user {} {} {} {setDirn} {}\
Control SetPoint 0 1 1 1 1 text user {} {} {} {setPoint} {}\
Control SetPoint 0 1 1 1 1 int user {} {} {} {setPoint} {}\
Control Command 0 1 1 1 0 text user {} {} {} {setCmnd.chkWrite} {}\
}