diff --git a/TektronixOscSup/tektronixOsc.proto b/TektronixOscSup/tektronixOsc.proto index 782a5fd..ddae3ba 100644 --- a/TektronixOscSup/tektronixOsc.proto +++ b/TektronixOscSup/tektronixOsc.proto @@ -1,4 +1,5 @@ OutTerminator = '\n'; +#InTerminator = '\n'; ReplyTimeout = 1000; getIDN { @@ -57,3 +58,12 @@ getYZERO { in "%f"; ExtraInput = Ignore; } + +getMeasurement { + out "MEASU:MEAS\$1:VALUE?"; + in "%f"; + ExtraInput = Ignore; + @init { + out "HEAD OFF"; + } +} diff --git a/TektronixOscSup/tektronixOsc_channel.template b/TektronixOscSup/tektronixOsc_channel.template index 360ec92..0ea8d03 100644 --- a/TektronixOscSup/tektronixOsc_channel.template +++ b/TektronixOscSup/tektronixOsc_channel.template @@ -3,7 +3,7 @@ record(fanout, "$(P):SCAN_CH$(CHANNEL)") { field(DESC, "Update data and preamble") - field(SCAN, "5 second") +# field(SCAN, "5 second") field(LNK1, "$(P):RAWYDATA_CH$(CHANNEL)") field(LNK2, "$(P):XINC_CH$(CHANNEL)") field(LNK3, "$(P):YMULT_CH$(CHANNEL)") @@ -84,3 +84,14 @@ record(ai, "$(P):YZERO_CH$(CHANNEL)") field(EGU, "") } +record(ai, "$(P):MEAS$(CHANNEL)") +{ + field(SCAN, "1 second") + field(DESC, "Measurement $(CHANNEL)") + field(DTYP, "stream") + field(INP, "@tektronixOsc.proto getMeasurement($(CHANNEL)) $(PORT)") + field(PREC, "3") + field(EGU, "") + info(INTEREST, "HIGH") + info(autosaveFields, "PREC EGU") +}