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

Reverted

Browse Source 
r3122 | ffr | 2011-04-29 10:53:41 +1000 (Fri, 29 Apr 2011) | 1 line
This commit is contained in:
Ferdi Franceschini
2011-04-29 10:53:41 +10:00
committed by Douglas Clowes
parent 0105298d79
commit 33e6611b14
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
site_ansto/instrument/sans/config/velsel/sct_velsel.tcl
View File

@@ -251,6 +251,11 @@ proc rdPwdAck {} {
hset $vs_root/status "busy" hset $vs_root/status "busy"
statemon start nvs_speed statemon start nvs_speed
statemon start nvs_lambda statemon start nvs_lambda
if {[sct writestatus] == "start"} {
# Called by drive adapter
hsetprop $vs_root/setspeed driving 1
hsetprop $vs_root/setLambda driving 1
}
return $nextState return $nextState
} }
@@ -300,7 +305,6 @@ proc rdPwdAck {} {
set state [lindex [hval $statuspath] $paramindex(state) end] set state [lindex [hval $statuspath] $paramindex(state) end]
set aspeed [lindex [hval $statuspath] $paramindex(aspeed) end] set aspeed [lindex [hval $statuspath] $paramindex(aspeed) end]
if {[string match {*CONTROL*} $state] || $aspeed != 0} { if {[string match {*CONTROL*} $state] || $aspeed != 0} {
sct driving 0
error "Not allowed while the velocity selector is running" error "Not allowed while the velocity selector is running"
} }
return OK return OK
@@ -310,7 +314,6 @@ proc is_Speed_in_blocked_range {speed} {
variable blocked_speeds variable blocked_speeds
foreach {min max} $blocked_speeds { foreach {min max} $blocked_speeds {
if {$min <= $speed && $speed <= $max} { if {$min <= $speed && $speed <= $max} {
sct driving 0
error "Speed of $speed rpm is within the blocked range of $min to $max rpm" error "Speed of $speed rpm is within the blocked range of $min to $max rpm"
} }
} }
@@ -355,7 +358,6 @@ proc get_nearest_allowed_speed {speed} {
set speed [sct target] set speed [sct target]
set ttang [lindex [hval $statuspath] $paramindex(ttang) end] set ttang [lindex [hval $statuspath] $paramindex(ttang) end]
if {$ttang > 90} { if {$ttang > 90} {
sct driving 0
error "ERROR: You must first initialise the turntable" error "ERROR: You must first initialise the turntable"
} }
@@ -370,7 +372,6 @@ proc checkBlockedWavelengths {statuspath} {
set lambda [sct target] set lambda [sct target]
set ttang [lindex [hval $statuspath] $paramindex(ttang) end] set ttang [lindex [hval $statuspath] $paramindex(ttang) end]
if {$ttang > 90} { if {$ttang > 90} {
sct driving 0
error "ERROR: You must first initialise the turntable" error "ERROR: You must first initialise the turntable"
} }
set angle [lindex [hval $statuspath] $paramindex(ttang) end] set angle [lindex [hval $statuspath] $paramindex(ttang) end]
@@ -423,6 +424,11 @@ proc halt {root} {
hset $vs_root/status "busy" hset $vs_root/status "busy"
statemon start nvs_speed statemon start nvs_speed
statemon start nvs_lambda statemon start nvs_lambda
if {[sct writestatus] == "start"} {
# Called by drive adapter
hsetprop $vs_root/setLambda driving 1
hsetprop $vs_root/setspeed driving 1
}
return $nextState return $nextState
} }