From 5670a0b967df8d0709d5deb8a02e1ffd6534e5a4 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Thu, 8 Feb 2024 18:19:44 +0000
Subject: [PATCH 1/2] Add measure command

---
 TektronixOscSup/tektronixOsc.proto            | 10 ++++++++++
 TektronixOscSup/tektronixOsc_channel.template | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

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..e621070 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,12 @@ 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)")
+    info(INTEREST, "HIGH")
+	field(EGU, "")
+}

From 73735a4e9675e22ae23dbed6c90e6dfcb1d3f4fb Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Wed, 21 Feb 2024 12:31:22 +0000
Subject: [PATCH 2/2] Autosave PREC and EGU

---
 TektronixOscSup/tektronixOsc_channel.template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/TektronixOscSup/tektronixOsc_channel.template b/TektronixOscSup/tektronixOsc_channel.template
index e621070..0ea8d03 100644
--- a/TektronixOscSup/tektronixOsc_channel.template
+++ b/TektronixOscSup/tektronixOsc_channel.template
@@ -90,6 +90,8 @@ record(ai, "$(P):MEAS$(CHANNEL)")
     field(DESC, "Measurement $(CHANNEL)")
     field(DTYP, "stream")
     field(INP,  "@tektronixOsc.proto getMeasurement($(CHANNEL)) $(PORT)")
-    info(INTEREST, "HIGH")
+	field(PREC, "3")
 	field(EGU, "")
+    info(INTEREST, "HIGH")
+    info(autosaveFields, "PREC EGU")
 }