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

Merge from Quokka hvcommands.tcl and pulser.tcl

Browse Source
This commit is contained in:
Douglas Clowes
2014-06-25 16:08:16 +10:00
parent ba16ebb992
commit 5b48df31ba
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/config/commands/hvcommands.tcl
View File

@ -23,7 +23,7 @@ proc SetVolt {volt} {
} }
proc GetVolt {} { proc GetVolt {} {
pulser send VOLT:OFFS? pulser transact VOLT:OFFS?
} }
proc SingleVolt {volt oscno} { proc SingleVolt {volt oscno} {
@ -47,7 +47,7 @@ proc SetDC {} {
pulseroff pulseroff
#NOTE: Setting FUNC DC generates a remote ctrl error if the #NOTE: Setting FUNC DC generates a remote ctrl error if the
# burst mode happens to be on # burst mode happens to be on
set resp [pulser send "BURS:STAT OFF;:FUNC DC;:VOLT:OFFS 0; OFFS?"] set resp [pulser transact "BURS:STAT OFF;:FUNC DC;:VOLT:OFFS 0; OFFS?"]
pulseron pulseron
} }
@ -311,7 +311,7 @@ proc PulserBurst {} {
PulserOn PulserOn
pulser send "*TRG;:BURS:NCYC?" pulser send "*TRG;:BURS:NCYC?"
while {1} { while {1} {
set sval [pulser send *OPC?] set sval [pulser transact *OPC?]
if {[string first 1 $sval] >-1} {break} if {[string first 1 $sval] >-1} {break}
} }
PulserOff PulserOff

11
site_ansto/instrument/config/commands/pulser.tcl
View File

@ -11,13 +11,14 @@ proc PulserOff {} {
proc PulserTTLOn {} { proc PulserTTLOn {} {
#NOTE: Setting FUNC DC generates a remote ctrl error if the #NOTE: Setting FUNC DC generates a remote ctrl error if the
# burst mode happens to be on # burst mode happens to be on
pulser send "BURS:STAT OFF;:FUNC DC;:VOLT:OFFS 5; OFFS?" # Set 5.2 Volts to get about 5.1. (5 actually gives 4.8)
pulser send "BURS:STAT OFF;:FUNC DC;:VOLT:OFFS 5.2; OFFS?"
PulserOn PulserOn
} }
proc PulserSin {Freq Volt} { proc PulserSin {Freq Volt} {
set resp [pulser send FUNC?] set resp [pulser transact FUNC?]
if {[string first "SIN" $resp ] == -1 } { if {[string first "SIN" $resp ] == -1 } {
pulser send "FUNC SIN;:FUNC?" pulser send "FUNC SIN;:FUNC?"
} }
@ -28,7 +29,7 @@ proc PulserSin {Freq Volt} {
} }
proc PulserSquare {Freq Volt} { proc PulserSquare {Freq Volt} {
set resp [pulser send FUNC?] set resp [pulser transact FUNC?]
if {[string first "SQU" $resp ] == -1 } { if {[string first "SQU" $resp ] == -1 } {
pulser send "FUNC SQU;:FUNC?" pulser send "FUNC SQU;:FUNC?"
} }
@ -39,7 +40,7 @@ proc PulserSquare {Freq Volt} {
} }
proc PulserSquareOffs {Freq Volt Offs} { proc PulserSquareOffs {Freq Volt Offs} {
set resp [pulser send FUNC?] set resp [pulser transact FUNC?]
if {[string first "SQU" $resp ] == -1 } { if {[string first "SQU" $resp ] == -1 } {
pulser send "FUNC SQU;:FUNC?" pulser send "FUNC SQU;:FUNC?"
} }
@ -53,7 +54,7 @@ proc PulserSquareOffs {Freq Volt Offs} {
proc PulserDC {Volt} { proc PulserDC {Volt} {
#NOTE: Setting FUNC DC generates a remote ctrl error if the #NOTE: Setting FUNC DC generates a remote ctrl error if the
# burst mode happens to be on # burst mode happens to be on
set resp [pulser send "BURS:STAT OFF;:FUNC DC;:VOLT:OFFS $Volt; OFFS?"] set resp [pulser transact "BURS:STAT OFF;:FUNC DC;:VOLT:OFFS $Volt; OFFS?"]
broadcast $resp broadcast $resp
} }