Remove superfluous trailing white space from TCL files
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
##
|
||||
# @file Green Magnetic Controller
|
||||
# @file Green Magnetic Controller
|
||||
#
|
||||
# This is a driver for SICS to make following communication with the Labview Green Magnet device
|
||||
#
|
||||
@@ -67,14 +67,14 @@ proc ::scobj::green::rqGreenMagnetFunc {basePath} {
|
||||
|
||||
##
|
||||
# @brief Make a Green Magnet Controller
|
||||
#
|
||||
# @param argList, {name "magnetic" IP localhost PORT 65123 tuning 1 interval 1}
|
||||
#
|
||||
# @param argList, {name "magnetic" IP localhost PORT 65123 tuning 1 interval 1}
|
||||
#
|
||||
# name: name of green magnet controller object
|
||||
# IP: IP address of RF generator moxa box
|
||||
# POT: Port number assigned to the generator on the moxa-box
|
||||
# tuning: boolean, set tuning=1 to allow instrument scientists to set the axe positions
|
||||
# interval: polling and ramping interval in seconds.
|
||||
# interval: polling and ramping interval in seconds.
|
||||
|
||||
proc ::scobj::green::mkGreen {argList} {
|
||||
# Generate parameter array from the argument list
|
||||
@@ -84,12 +84,12 @@ proc ::scobj::green::mkGreen {argList} {
|
||||
}
|
||||
|
||||
MakeSICSObj $pa(NAME) SCT_OBJECT
|
||||
sicslist setatt $pa(NAME) klass environment
|
||||
sicslist setatt $pa(NAME) klass environment
|
||||
sicslist setatt $pa(NAME) long_name $pa(NAME)
|
||||
|
||||
set scobj_hpath /sics/$pa(NAME)
|
||||
|
||||
hfactory $scobj_hpath/output plain user float
|
||||
hfactory $scobj_hpath/output plain user float
|
||||
hfactory $scobj_hpath/PSU_Vol plain user float
|
||||
hfactory $scobj_hpath/ramping_rate plain user text
|
||||
hfactory $scobj_hpath/insTarget plain user float
|
||||
@@ -118,7 +118,7 @@ proc ::scobj::green::mkGreen {argList} {
|
||||
hsetprop $scobj_hpath type part
|
||||
hsetprop $scobj_hpath control true
|
||||
hsetprop $scobj_hpath data true
|
||||
|
||||
|
||||
foreach {hpath klass control data nxsave mutable priv alias} {
|
||||
output NXenvironment true true true true user green_output
|
||||
PSU_Vol NXenvironment true true true true user green_PSU_Vol
|
||||
@@ -143,11 +143,11 @@ proc ::scobj::green::mkGreen {argList} {
|
||||
hsetprop $scobj_hpath/pollNode oldval "UNKNOWN"
|
||||
|
||||
#if {[SplitReply [environment_simulation]]=="false"} {
|
||||
sct_green poll $scobj_hpath/pollNode $pa(INTERVAL)
|
||||
#}
|
||||
sct_green poll $scobj_hpath/pollNode $pa(INTERVAL)
|
||||
#}
|
||||
}
|
||||
|
||||
# Set the magnetic voltage field
|
||||
# Set the magnetic voltage field
|
||||
proc greenVol {{vol ""} args} {
|
||||
set NAME "green_magnet"
|
||||
|
||||
@@ -156,7 +156,7 @@ proc greenVol {{vol ""} args} {
|
||||
} else {
|
||||
if {$vol<[SplitReply [hgetprop /sample/$NAME/output lowlimit]] || \
|
||||
$vol>[SplitReply [hgetprop /sample/$NAME/output uplimit]]} {
|
||||
return -code error "setpoint violates limits"
|
||||
return -code error "setpoint violates limits"
|
||||
} else {
|
||||
if {$vol > [hval /sample/$NAME/Bmax]} {
|
||||
broadcast "Maximum field limit is [hval /sample/$NAME/Bmax], reset again!"
|
||||
@@ -164,7 +164,7 @@ proc greenVol {{vol ""} args} {
|
||||
} else {
|
||||
#hset /sample/$NAME/setPoint $vol
|
||||
set comm "set $vol\r\n"
|
||||
sct_green send $comm
|
||||
sct_green send $comm
|
||||
#after 2000
|
||||
#while {[hval /sample/$NAME/status] == "busy"} {
|
||||
# broadcast "Magnet Ramping at [hval /sample/$NAME/output]"
|
||||
@@ -192,7 +192,7 @@ publish greenVol user
|
||||
#PORT 22
|
||||
::scobj::green::mkGreen {
|
||||
name "green_magnet"
|
||||
IP 137.157.204.57
|
||||
IP 137.157.204.57
|
||||
PORT 22
|
||||
tuning 1
|
||||
interval 3
|
||||
|
||||
Reference in New Issue
Block a user