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

Make sure spin flipper code in rfamp.c is initialised

Browse Source 
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
This commit is contained in:
Ferdi Franceschini
2011-02-25 18:27:31 +11:00
committed by Douglas Clowes
parent 009fdbfc29
commit 7371a561d9
30 changed files with 10384 additions and 75 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,11 +251,6 @@ proc rdPwdAck {} {
hset $vs_root/status "busy"
statemon start nvs_speed
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
}
@@ -305,6 +300,7 @@ proc rdPwdAck {} {
set state [lindex [hval $statuspath] $paramindex(state) end]
set aspeed [lindex [hval $statuspath] $paramindex(aspeed) end]
if {[string match {*CONTROL*} $state] || $aspeed != 0} {
sct driving 0
error "Not allowed while the velocity selector is running"
}
return OK
@@ -314,6 +310,7 @@ proc is_Speed_in_blocked_range {speed} {
variable blocked_speeds
foreach {min max} $blocked_speeds {
if {$min <= $speed && $speed <= $max} {
sct driving 0
error "Speed of $speed rpm is within the blocked range of $min to $max rpm"
}
}
@@ -358,6 +355,7 @@ proc get_nearest_allowed_speed {speed} {
set speed [sct target]
set ttang [lindex [hval $statuspath] $paramindex(ttang) end]
if {$ttang > 90} {
sct driving 0
error "ERROR: You must first initialise the turntable"
}
@@ -372,6 +370,7 @@ proc checkBlockedWavelengths {statuspath} {
set lambda [sct target]
set ttang [lindex [hval $statuspath] $paramindex(ttang) end]
if {$ttang > 90} {
sct driving 0
error "ERROR: You must first initialise the turntable"
}
set angle [lindex [hval $statuspath] $paramindex(ttang) end]
@@ -424,11 +423,6 @@ proc halt {root} {
hset $vs_root/status "busy"
statemon start nvs_speed
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
}