- Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS - Added a driver for the POLDI power supplies SKIPPED: psi/A1931.c psi/autowin.c psi/bruker.c psi/docho.c psi/dornier2.c psi/dspcode.c psi/ease.c psi/ecb.c psi/ecbcounter.c psi/ecbdriv.c psi/el734dc.c psi/el734driv.c psi/el734hp.c psi/el737driv.c psi/el737hpdriv.c psi/el737hpdrivsps.c psi/el737hpv2driv.c psi/el755driv.c psi/eurodriv.c psi/haakedriv.c psi/itc4driv.c psi/julcho.c psi/linadriv.c psi/lmd200.c psi/lscsupport.c psi/ltc11.c psi/make_gen psi/oicom.c psi/oxinst.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/sanscook.c psi/sanslirebin.c psi/sanswave.c psi/sinqhmdriv.c psi/sinqhttp.c psi/slsecho.c psi/slsmagnet.c psi/slsvme.c psi/sps.c psi/swmotor.c psi/swmotor2.c psi/tabledrive.c psi/tasscan.c psi/tdchm.c psi/velodorn.c psi/velodornier.c
This commit is contained in:
@ -1,3 +1,3 @@
|
||||
271
|
||||
294
|
||||
NEVER, EVER modify or delete this file
|
||||
You'll risk eternal damnation and a reincarnation as a cockroach!|n
|
||||
You'll risk eternal damnation and a reincarnation as a cockroach!
|
||||
|
@ -52,11 +52,14 @@ test motorpar-1.8 {Test ignorefault} -body {
|
||||
test motorpar-1.9 {Test movecount} -body {
|
||||
testPar "brumm movecount" 12 Mugger } -result OK
|
||||
|
||||
test motorpar-1.10 {Test hardupper} -body {
|
||||
testROPar "brumm hardupperlim" 180 } -result OK
|
||||
#-------- This test always fails because the regression motor driver
|
||||
# handles hard limits
|
||||
#---------------------------------------------------------------
|
||||
# test motorpar-1.10 {Test hardupper} -body {
|
||||
# testPar "brumm hardupperlim" 180 Mugger} -result OK
|
||||
|
||||
test motorpar-1.11 {Test hardlower} -body {
|
||||
testROPar "brumm hardlowerlim" -180 } -result OK
|
||||
# test motorpar-1.11 {Test hardlower} -body {
|
||||
# testPar "brumm hardlowerlim" -180 Mugger} -result OK
|
||||
|
||||
brumm recover 0
|
||||
brumm errortype 0
|
||||
|
@ -177,6 +177,9 @@ phi movecount 10.000000
|
||||
# Counter scancter
|
||||
scancter SetPreset 0.000000
|
||||
scancter SetMode Timer
|
||||
# Counter counter
|
||||
counter SetPreset 0.000000
|
||||
counter SetMode Timer
|
||||
hm CountMode timer
|
||||
hm preset 10.000000
|
||||
tof CountMode timer
|
||||
|
@ -4,6 +4,8 @@
|
||||
# Started: Dr. Mark Koennecke, July 2006
|
||||
#---------------------------------------------------------------------------
|
||||
set home $env(HOME)/src/workspace/sics/test
|
||||
|
||||
protocol set all
|
||||
#----------------------------------------------------------------------------
|
||||
# O P T I O N S
|
||||
# --------------- ----------------------------------------------------------
|
||||
@ -100,6 +102,7 @@ Motor chi SIM 0 360 -.1 10
|
||||
Motor phi SIM 0 360 -.1 10
|
||||
|
||||
MakeMultiCounter scanCter aba
|
||||
SicsAlias scanCter counter
|
||||
|
||||
proc scantransfer {} {
|
||||
set FWHM 1.5
|
||||
@ -191,6 +194,11 @@ sa endconfig
|
||||
#-----------------------------------------------------------------------
|
||||
# Hipadaba
|
||||
#----------------------------------------------------------------------
|
||||
proc SplitReply { text } {
|
||||
set l [split $text =]
|
||||
return [string trim [lindex $l 1]]
|
||||
}
|
||||
#---------------------------------------------------------------------
|
||||
source ../tcl/hdbutil.tcl
|
||||
hmake /instrument spy none
|
||||
hmake /instrument/sample spy none
|
||||
@ -703,10 +711,40 @@ proc testerr {input} {
|
||||
}
|
||||
|
||||
|
||||
set slsecho 1
|
||||
|
||||
if {$slsecho == 1} {
|
||||
makesctcontroller echo testprot testprot.dat
|
||||
|
||||
source ../tcl/stddrive.tcl
|
||||
source ../tcl/slsecho.tcl
|
||||
makesctcontroller slssct slsecho 129.129.195.50:5001
|
||||
makesctcontroller slssct slsecho taspmagnet:5001
|
||||
#makesctcontroller slssct slsecho localhost:8080
|
||||
slsecho::makeslsecho ma1 0 slssct
|
||||
}
|
||||
|
||||
|
||||
set nhq202m 0
|
||||
|
||||
if {$nhq202m == 1} {
|
||||
source ../tcl/stddrive.tcl
|
||||
source ../tcl/nhq202m.tcl
|
||||
#makesctcontroller nhq202 charbychar localhost:8005 "\r\n"
|
||||
#makesctcontroller nhq202 charbychar localhost:8080 "\r\n"
|
||||
makesctcontroller nhq202 charbychar psts225:3002 "\r\n"
|
||||
#------- Put him into lovely mode, it needs a few commands before it gets there
|
||||
nhq202 transact \#
|
||||
nhq202 transact \#
|
||||
nhq202 transact \#
|
||||
nhq202 debug 0
|
||||
nhq202m::makehv hv1 nhq202 1
|
||||
}
|
||||
|
||||
set poldizug 0
|
||||
|
||||
if {$poldizug == 1} {
|
||||
makesctcontroller zugsct std pc6651:4167 "\r\n" 3.0 "\r\n"
|
||||
zugsct debug 0
|
||||
source ../tcl/stddrive.tcl
|
||||
source ../sim/poldi_sics/zug.tcl
|
||||
}
|
||||
|
Reference in New Issue
Block a user